summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
diff options
context:
space:
mode:
authorSean Paul2018-03-05 23:22:54 +0100
committerHeiko Stuebner2018-03-08 23:28:53 +0100
commit60beeccc72cabefcb8874fec542b3142e262b6c2 (patch)
tree2cd3bd6405f5c4be94c0a6c7c7c9343587777b9b /drivers/gpu/drm/rockchip/rockchip_drm_drv.c
parentdrm/rockchip: analogix_dp: set psr activate/deactivate when enable/disable br... (diff)
downloadkernel-qcow2-linux-60beeccc72cabefcb8874fec542b3142e262b6c2.tar.gz
kernel-qcow2-linux-60beeccc72cabefcb8874fec542b3142e262b6c2.tar.xz
kernel-qcow2-linux-60beeccc72cabefcb8874fec542b3142e262b6c2.zip
drm/rockchip: Don't use atomic constructs for psr
Instead of using timer and spinlocks, use delayed_work and mutexes for rockchip psr. This allows us to make blocking calls when enabling/disabling psr (which is sort of important given we're talking over dpcd to the display). Cc: Caesar Wang <wxt@rock-chips.com> Cc: 征增 王 <wzz@rock-chips.com> Cc: Stéphane Marchesin <marcheu@chromium.org> Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Link: https://patchwork.freedesktop.org/patch/msgid/20180305222324.5872-3-enric.balletbo@collabora.com
Diffstat (limited to 'drivers/gpu/drm/rockchip/rockchip_drm_drv.c')
-rw-r--r--drivers/gpu/drm/rockchip/rockchip_drm_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 1920334dbdaa..f814d37b1db2 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -134,7 +134,7 @@ static int rockchip_drm_bind(struct device *dev)
drm_dev->dev_private = private;
INIT_LIST_HEAD(&private->psr_list);
- spin_lock_init(&private->psr_list_lock);
+ mutex_init(&private->psr_list_lock);
ret = rockchip_drm_init_iommu(drm_dev);
if (ret)