diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-28 02:38:09 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-05-28 02:38:09 +0200 |
| commit | 97758ff7c8f93ea0ed43eb7aef6c942f667372a0 (patch) | |
| tree | 78680e2a0bda8fa9fcbb2e6319bb636f6f546706 /drivers | |
| parent | Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | drm/plane-helper: Adapt cursor hack to transitional helpers (diff) | |
| download | linux-97758ff7c8f93ea0ed43eb7aef6c942f667372a0.tar.xz linux-97758ff7c8f93ea0ed43eb7aef6c942f667372a0.zip | |
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.c | 3 |
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) { |