Commit 97758ff7 authored by Dave Airlie's avatar Dave Airlie

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
parents 9caa2b02 2e7f43c4
...@@ -465,6 +465,9 @@ int drm_plane_helper_commit(struct drm_plane *plane, ...@@ -465,6 +465,9 @@ int drm_plane_helper_commit(struct drm_plane *plane,
if (!crtc[i]) if (!crtc[i])
continue; continue;
if (crtc[i]->cursor == plane)
continue;
/* There's no other way to figure out whether the crtc is running. */ /* There's no other way to figure out whether the crtc is running. */
ret = drm_crtc_vblank_get(crtc[i]); ret = drm_crtc_vblank_get(crtc[i]);
if (ret == 0) { if (ret == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment