Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:52990 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752361AbbFCGfB (ORCPT ); Wed, 3 Jun 2015 02:35:01 -0400 Subject: Patch "drm/plane-helper: Adapt cursor hack to transitional helpers" has been added to the 4.0-stable tree To: daniel.vetter@ffwll.ch, daniel.vetter@intel.com, gregkh@linuxfoundation.org, jani.nikula@intel.com, mario.kleiner.de@gmail.com, ppaalanen@gmail.com Cc: , From: Date: Wed, 03 Jun 2015 15:34:53 +0900 Message-ID: <143331329317191@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled drm/plane-helper: Adapt cursor hack to transitional helpers to the 4.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-plane-helper-adapt-cursor-hack-to-transitional-helpers.patch and it can be found in the queue-4.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From 2e7f43c41c042d6fed4d67aceeaae32d8f102e98 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 20 May 2015 10:36:32 +0200 Subject: drm/plane-helper: Adapt cursor hack to transitional helpers From: Daniel Vetter commit 2e7f43c41c042d6fed4d67aceeaae32d8f102e98 upstream. 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 Signed-off-by: Daniel Vetter Reviewed-and-tested-by: Mario Kleiner Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_plane_helper.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/gpu/drm/drm_plane_helper.c +++ b/drivers/gpu/drm/drm_plane_helper.c @@ -476,6 +476,9 @@ int drm_plane_helper_commit(struct drm_p 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) { Patches currently in stable-queue which might be from daniel.vetter@ffwll.ch are queue-4.0/drm-plane-helper-adapt-cursor-hack-to-transitional-helpers.patch