Revert "drm/vmwgfx: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()"

This reverts commit 6b92e77156c5adf6606c8ad825c71404417d88af.

This patchset breaks on intel platforms and was previously NACK'd by
Ville.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Fernando Ramos <greenfoo@u92.eu>
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211002154542.15800-12-sean@poorly.run

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
index 7df35c6..28af34a 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
@@ -28,7 +28,6 @@
 #include "vmwgfx_drv.h"
 #include "vmwgfx_devcaps.h"
 #include <drm/vmwgfx_drm.h>
-#include <drm/drm_drv.h>
 #include "vmwgfx_kms.h"
 
 int vmw_getparam_ioctl(struct drm_device *dev, void *data,
@@ -173,7 +172,6 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
        struct drm_vmw_rect __user *clips_ptr;
        struct drm_vmw_rect *clips = NULL;
        struct drm_framebuffer *fb;
-       struct drm_modeset_acquire_ctx ctx;
        struct vmw_framebuffer *vfb;
        struct vmw_resource *res;
        uint32_t num_clips;
@@ -205,7 +203,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
                goto out_no_copy;
        }
 
-       DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
+       drm_modeset_lock_all(dev);
 
        fb = drm_framebuffer_lookup(dev, file_priv, arg->fb_id);
        if (!fb) {
@@ -233,7 +231,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
 out_no_surface:
        drm_framebuffer_put(fb);
 out_no_fb:
-       DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+       drm_modeset_unlock_all(dev);
 out_no_copy:
        kfree(clips);
 out_clips:
@@ -252,7 +250,6 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
        struct drm_vmw_rect __user *clips_ptr;
        struct drm_vmw_rect *clips = NULL;
        struct drm_framebuffer *fb;
-       struct drm_modeset_acquire_ctx ctx;
        struct vmw_framebuffer *vfb;
        uint32_t num_clips;
        int ret;
@@ -283,7 +280,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
                goto out_no_copy;
        }
 
-       DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
+       drm_modeset_lock_all(dev);
 
        fb = drm_framebuffer_lookup(dev, file_priv, arg->fb_id);
        if (!fb) {
@@ -306,7 +303,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
 out_no_ttm_lock:
        drm_framebuffer_put(fb);
 out_no_fb:
-       DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+       drm_modeset_unlock_all(dev);
 out_no_copy:
        kfree(clips);
 out_clips:

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 268095c..74fa419 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -33,7 +33,6 @@
 #include <drm/drm_rect.h>
 #include <drm/drm_sysfs.h>
 #include <drm/drm_vblank.h>
-#include <drm/drm_drv.h>
 
 #include "vmwgfx_kms.h"
 
@@ -244,17 +243,15 @@ void vmw_kms_legacy_hotspot_clear(struct vmw_private *dev_priv)
        struct drm_device *dev = &dev_priv->drm;
        struct vmw_display_unit *du;
        struct drm_crtc *crtc;
-       struct drm_modeset_acquire_ctx ctx;
-       int ret;
 
-       DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
+       drm_modeset_lock_all(dev);
        drm_for_each_crtc(crtc, dev) {
                du = vmw_crtc_to_du(crtc);
 
                du->hotspot_x = 0;
                du->hotspot_y = 0;
        }
-       DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+       drm_modeset_unlock_all(dev);
 }
 
 void vmw_kms_cursor_post_execbuf(struct vmw_private *dev_priv)
@@ -1015,10 +1012,9 @@ static int vmw_framebuffer_bo_dirty(struct drm_framebuffer *framebuffer,
        struct vmw_framebuffer_bo *vfbd =
                vmw_framebuffer_to_vfbd(framebuffer);
        struct drm_clip_rect norect;
-       struct drm_modeset_acquire_ctx ctx;
        int ret, increment = 1;
 
-       DRM_MODESET_LOCK_ALL_BEGIN((&dev_priv->drm), ctx, 0, ret);
+       drm_modeset_lock_all(&dev_priv->drm);
 
        if (!num_clips) {
                num_clips = 1;
@@ -1044,7 +1040,7 @@ static int vmw_framebuffer_bo_dirty(struct drm_framebuffer *framebuffer,
 
        vmw_cmd_flush(dev_priv, false);
 
-       DRM_MODESET_LOCK_ALL_END((&dev_priv->drm), ctx, ret);
+       drm_modeset_unlock_all(&dev_priv->drm);
 
        return ret;
 }