Merge tag 'drm-misc-fixes-2017-11-13' of git://anongit.freedesktop.org/drm/drm-misc...

Driver Changes:
- qxl: Use a shadow bo as primary and blit to it to fix flicker (Gerd)
- rockchip: Convert psr spinlock to mutex (Emil)

Cc: Emil Renner Berthing <kernel@esmil.dk>
Cc: Gerd Hoffmann <kraxel@redhat.com>
* tag 'drm-misc-fixes-2017-11-13' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/rockchip: analogix_dp: Use mutex rather than spinlock

diff --cc drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 4d3f6ad0abdde8e8dcc142d1e6c724cdb2136259,d8f72d87ef0819e2499d233d1f9c9b762a9b067e..93b7102dd008931ee0fbceb1f59e7f60fc292923
--- 1/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
--- 2/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@@ -88,9 -87,9 +87,9 @@@ static void analogix_dp_psr_set(struct 
        if (!analogix_dp_psr_supported(dp->dev))
                return;
  
 -      dev_dbg(dp->dev, "%s PSR...\n", enabled ? "Entry" : "Exit");
 +      DRM_DEV_DEBUG(dp->dev, "%s PSR...\n", enabled ? "Entry" : "Exit");
  
-       spin_lock_irqsave(&dp->psr_lock, flags);
+       mutex_lock(&dp->psr_lock);
        if (enabled)
                dp->psr_state = EDP_VSC_PSR_STATE_ACTIVE;
        else