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

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 4d3f6ad0abdd..93b7102dd008 100644
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -72,7 +72,7 @@ struct rockchip_dp_device {
         struct reset_control     *rst;
 
         struct work_struct       psr_work;
-        spinlock_t               psr_lock;
+        struct mutex             psr_lock;
         unsigned int             psr_state;
 
         const struct rockchip_dp_chip_data *data;
@@ -83,21 +83,20 @@ struct rockchip_dp_device {
 static void analogix_dp_psr_set(struct drm_encoder *encoder, bool enabled)
 {
         struct rockchip_dp_device *dp = to_dp(encoder);
-        unsigned long flags;
 
         if (!analogix_dp_psr_supported(dp->dev))
                 return;
 
         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
                 dp->psr_state = ~EDP_VSC_PSR_STATE_ACTIVE;
 
         schedule_work(&dp->psr_work);
-        spin_unlock_irqrestore(&dp->psr_lock, flags);
+        mutex_unlock(&dp->psr_lock);
 }
 
 static void analogix_dp_psr_work(struct work_struct *work)
@@ -105,7 +104,6 @@ static void analogix_dp_psr_work(struct work_struct *work)
         struct rockchip_dp_device *dp =
                                 container_of(work, typeof(*dp), psr_work);
         int ret;
-        unsigned long flags;
 
         ret = rockchip_drm_wait_vact_end(dp->encoder.crtc,
                                          PSR_WAIT_LINE_FLAG_TIMEOUT_MS);
@@ -114,12 +112,12 @@ static void analogix_dp_psr_work(struct work_struct *work)
                 return;
         }
 
-        spin_lock_irqsave(&dp->psr_lock, flags);
+        mutex_lock(&dp->psr_lock);
         if (dp->psr_state == EDP_VSC_PSR_STATE_ACTIVE)
                 analogix_dp_enable_psr(dp->dev);
         else
                 analogix_dp_disable_psr(dp->dev);
-        spin_unlock_irqrestore(&dp->psr_lock, flags);
+        mutex_unlock(&dp->psr_lock);
 }
 
 static int rockchip_dp_pre_init(struct rockchip_dp_device *dp)
@@ -381,7 +379,7 @@ static int rockchip_dp_bind(struct device *dev, struct device *master,
         dp->plat_data.power_off = rockchip_dp_powerdown;
         dp->plat_data.get_modes = rockchip_dp_get_modes;
 
-        spin_lock_init(&dp->psr_lock);
+        mutex_init(&dp->psr_lock);
         dp->psr_state = ~EDP_VSC_PSR_STATE_ACTIVE;
         INIT_WORK(&dp->psr_work, analogix_dp_psr_work);