From: Dave Airlie <airlied@redhat.com>
Date: Mon, 13 Nov 2017 19:29:34 +0000 (+1000)
Subject: Merge tag 'drm-misc-fixes-2017-11-13' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v4.15-rc1~90^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ecc325bb76707370cfa6f34ef8574c7ee7577a23;p=linux.git

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

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
---

ecc325bb76707370cfa6f34ef8574c7ee7577a23
diff --cc drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 4d3f6ad0abdd,d8f72d87ef08..93b7102dd008
--- a/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