Re: [PATCH 05/15] drm/vmwgfx: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()

Sean Paul
2021-09-17T15:37:12Z

On Thu, Sep 16, 2021 at 11:15:42PM +0200, Fernando Ramos wrote:
> As requested in Documentation/gpu/todo.rst, replace driver calls to
> drm_modeset_lock_all() with DRM_MODESET_LOCK_ALL_BEGIN() and
> DRM_MODESET_LOCK_ALL_END()
>

Reviewed-by: Sean Paul <sean@poorly.run>

> Signed-off-by: Fernando Ramos <greenfoo@u92.eu>
> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 11 +++++++----
> drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 ++++++++----
> 2 files changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
> index 28af34ab6ed6..7df35c6f1458 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
> @@ -28,6 +28,7 @@
> #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,
> @@ -172,6 +173,7 @@ 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;
> @@ -203,7 +205,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
> goto out_no_copy;
> }
>
> - drm_modeset_lock_all(dev);
> + DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
>
> fb = drm_framebuffer_lookup(dev, file_priv, arg->fb_id);
> if (!fb) {
> @@ -231,7 +233,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
> out_no_surface:
> drm_framebuffer_put(fb);
> out_no_fb:
> - drm_modeset_unlock_all(dev);
> + DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
> out_no_copy:
> kfree(clips);
> out_clips:
> @@ -250,6 +252,7 @@ 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;
> @@ -280,7 +283,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
> goto out_no_copy;
> }
>
> - drm_modeset_lock_all(dev);
> + DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
>
> fb = drm_framebuffer_lookup(dev, file_priv, arg->fb_id);
> if (!fb) {
> @@ -303,7 +306,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_unlock_all(dev);
> + DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
> 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 74fa41909213..268095cb8c84 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> @@ -33,6 +33,7 @@
> #include <drm/drm_rect.h>
> #include <drm/drm_sysfs.h>
> #include <drm/drm_vblank.h>
> +#include <drm/drm_drv.h>
>
> #include "vmwgfx_kms.h"
>
> @@ -243,15 +244,17 @@ 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(dev);
> + DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
> drm_for_each_crtc(crtc, dev) {
> du = vmw_crtc_to_du(crtc);
>
> du->hotspot_x = 0;
> du->hotspot_y = 0;
> }
> - drm_modeset_unlock_all(dev);
> + DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
> }
>
> void vmw_kms_cursor_post_execbuf(struct vmw_private *dev_priv)
> @@ -1012,9 +1015,10 @@ 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(&dev_priv->drm);
> + DRM_MODESET_LOCK_ALL_BEGIN((&dev_priv->drm), ctx, 0, ret);
>
> if (!num_clips) {
> num_clips = 1;
> @@ -1040,7 +1044,7 @@ static int vmw_framebuffer_bo_dirty(struct drm_framebuffer *framebuffer,
>
> vmw_cmd_flush(dev_priv, false);
>
> - drm_modeset_unlock_all(&dev_priv->drm);
> + DRM_MODESET_LOCK_ALL_END((&dev_priv->drm), ctx, ret);
>
> return ret;
> }
> --
> 2.33.0
>

--
Sean Paul, Software Engineer, Google / Chromium OS