From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f181.google.com ([209.85.212.181]:33603 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753638AbbEUORx (ORCPT ); Thu, 21 May 2015 10:17:53 -0400 Received: by wicmx19 with SMTP id mx19so14474411wic.0 for ; Thu, 21 May 2015 07:17:52 -0700 (PDT) Message-ID: <555DE90D.1020202@gmail.com> Date: Thu, 21 May 2015 16:17:49 +0200 From: Mario Kleiner MIME-Version: 1.0 To: Daniel Vetter , Intel Graphics Development , DRI Development CC: Daniel Vetter , Pekka Paalanen , stable@vger.kernel.org, wayland-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH] drm/plane-helper: Adapt cursor hack to transitional helpers References: <1432110992-24224-1-git-send-email-daniel.vetter@ffwll.ch> In-Reply-To: <1432110992-24224-1-git-send-email-daniel.vetter@ffwll.ch> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: On 05/20/2015 10:36 AM, Daniel Vetter wrote: > In > > commit f02ad907cd9e7fe3a6405d2d005840912f1ed258 > Author: Daniel Vetter > 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 > Cc: Pekka Paalanen > Cc: stable@vger.kernel.org > Signed-off-by: Daniel Vetter > --- > 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) { > This one is Reviewed-and-tested-by: Mario Kleiner I was looking into Weston performance and the cursor problem, so had necessary tracing in place to test this. I can confirm that cursor related blocking in Westons drm-backend execution are gone with this patch applied, whereas they are still present when using hardware overlays on Intel, as expected. So hardware cursors should be fine again, once the patch also ends in stable kernels. thanks, -mario