Re: [PATCH] drm/plane-helper: Adapt cursor hack to transitional helpers

From: Pekka Paalanen <ppaalanen-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Giulio Camuffo
	<giuliocamuffo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	Derek Foreman <derekf-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>,
	nerdopolis
	<bluescreen_avenger-H+0wwilmMs3R7s880joybQ@public.gmane.org>
Cc: Daniel Vetter <daniel.vetter-/w4YWyX8dFk@public.gmane.org>,
	Intel Graphics Development
	<intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>,
	stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	wayland-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	DRI Development
	<dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>,
	Daniel Vetter
	<daniel.vetter-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Subject: Re: [PATCH] drm/plane-helper: Adapt cursor hack to transitional helpers
Date: Wed, 20 May 2015 11:43:49 +0300	[thread overview]
Message-ID: <20150520114349.2dff724f@gmail.com> (raw)
In-Reply-To: <1432110992-24224-1-git-send-email-daniel.vetter-/w4YWyX8dFk@public.gmane.org>

On Wed, 20 May 2015 10:36:32 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> 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>
> ---
>  drivers/gpu/drm/drm_plane_helper.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> 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) {

Hi,

just adding more people to CC who might want to test this.

When you test this, please make sure your Weston does *NOT* have this
patch:
http://cgit.freedesktop.org/wayland/weston/commit/?id=6858383d51b12632481370fdc7d886a1e6bb4ebd

That is, use Weston 1.7.92 or earlier.

Thanks,
pq
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel