From: Dave Airlie <airlied@redhat.com>
Date: Tue, 8 Sep 2020 04:41:40 +0000 (+1000)
Subject: Merge tag 'v5.9-rc4' into drm-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf;p=linux.git

Merge tag 'v5.9-rc4' into drm-next

Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf
diff --cc drivers/gpu/drm/qxl/qxl_display.c
index fa79688013b7d,099dca48b0ff3..6063f3a153290
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@@ -26,6 -26,6 +26,7 @@@
  #include <linux/crc32.h>
  #include <linux/delay.h>
  
++#include <drm/drm_drv.h>
  #include <drm/drm_atomic.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_gem_framebuffer_helper.h>
@@@ -184,9 -183,9 +185,9 @@@ void qxl_display_read_client_monitors_c
  		return;
  	}
  
 -	drm_modeset_lock_all(dev);
 +	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
  	qxl_update_offset_props(qdev);
- 	DRM_MODESET_LOCK_ALL_END(ctx, ret);
 -	drm_modeset_unlock_all(dev);
++	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
  	if (!drm_helper_hpd_irq_event(dev)) {
  		/* notify that the monitor configuration changed, to
  		   adjust at the arbitrary resolution */
@@@ -430,8 -430,7 +431,8 @@@ static int qxl_framebuffer_surface_dirt
  	qxl_draw_dirty_fb(qdev, fb, qobj, flags, color,
  			  clips, num_clips, inc, 0);
  
 -	drm_modeset_unlock_all(fb->dev);
 +out_lock_end:
- 	DRM_MODESET_LOCK_ALL_END(ctx, ret);
++	DRM_MODESET_LOCK_ALL_END(fb->dev, ctx, ret);
  
  	return 0;
  }