summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-05-28 10:38:09 +1000
committerDave Airlie <airlied@redhat.com>2015-05-28 10:38:09 +1000
commit97758ff7c8f93ea0ed43eb7aef6c942f667372a0 (patch)
tree78680e2a0bda8fa9fcbb2e6319bb636f6f546706 /drivers
parent9caa2b02294b067b1732487144544d7c3d90621a (diff)
parent2e7f43c41c042d6fed4d67aceeaae32d8f102e98 (diff)
Merge tag 'topic/drm-fixes-2015-05-27' of git://anongit.freedesktop.org/drm-intel into drm-fixes
here's a drm regression fix for drivers only partially converted to atomic. * tag 'topic/drm-fixes-2015-05-27' of git://anongit.freedesktop.org/drm-intel: drm/plane-helper: Adapt cursor hack to transitional helpers
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/drm_plane_helper.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index 40c1db9ad7c3..2f0ed11024eb 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -465,6 +465,9 @@ int drm_plane_helper_commit(struct drm_plane *plane,
if (!crtc[i])
continue;
+ if (crtc[i]->cursor == plane)
+ continue;
+
/* There's no other way to figure out whether the crtc is running. */
ret = drm_crtc_vblank_get(crtc[i]);
if (ret == 0) {