diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-05-20 10:36:32 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-05-22 08:48:08 +0300 |
| commit | 2e7f43c41c042d6fed4d67aceeaae32d8f102e98 (patch) | |
| tree | c90629e82e038486eadda6b1f2cdc293fb24b0f0 /drivers/gpu | |
| parent | 030bbdbf4c833bc69f502eae58498bc5572db736 (diff) | |
| download | linux-2e7f43c41c042d6fed4d67aceeaae32d8f102e98.tar.gz linux-2e7f43c41c042d6fed4d67aceeaae32d8f102e98.tar.bz2 linux-2e7f43c41c042d6fed4d67aceeaae32d8f102e98.zip | |
drm/plane-helper: Adapt cursor hack to transitional helpers
In
commit f02ad907cd9e7fe3a6405d2d005840912f1ed258
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu Jan 22 16:36:23 2015 +0100
drm/atomic-helpers: Recover full cursor plane behaviour
we've added a hack to atomic helpers to never to vblank waits for
cursor updates through the legacy apis since that's what X expects.
Unfortunately we've (again) forgotten to adjust the transitional
helpers. Do this now.
This fixes regressions for drivers only partially converted over to
atomic (like i915).
Reported-by: Pekka Paalanen <ppaalanen@gmail.com>
Cc: Pekka Paalanen <ppaalanen@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-and-tested-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu')
| -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) { |