From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-la0-f52.google.com ([209.85.215.52]:35389 "EHLO mail-la0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752817AbbETInz (ORCPT ); Wed, 20 May 2015 04:43:55 -0400 Received: by labbd9 with SMTP id bd9so63489017lab.2 for ; Wed, 20 May 2015 01:43:53 -0700 (PDT) Date: Wed, 20 May 2015 11:43:49 +0300 From: Pekka Paalanen To: Giulio Camuffo , Derek Foreman , nerdopolis Cc: Daniel Vetter , Intel Graphics Development , DRI Development , wayland-devel@lists.freedesktop.org, stable@vger.kernel.org, Daniel Vetter Subject: Re: [PATCH] drm/plane-helper: Adapt cursor hack to transitional helpers Message-ID: <20150520114349.2dff724f@gmail.com> In-Reply-To: <1432110992-24224-1-git-send-email-daniel.vetter@ffwll.ch> References: <1432110992-24224-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: On Wed, 20 May 2015 10:36:32 +0200 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) { 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