From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mga14.intel.com ([192.55.52.115]:35999 "EHLO mga14.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1727593AbeIENxl (ORCPT <rfc822;stable@vger.kernel.org>);
        Wed, 5 Sep 2018 09:53:41 -0400
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Karsten Hohmeier <karsten@hohmatik.de>,
        dri-devel@lists.freedesktop.org
Cc: David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Madhur Verma <madhur.verma@samsung.com>,
        stable@vger.kernel.org,
        Hemanshu Srivastava <hemanshu.s@samsung.com>,
        Sean Paul <seanpaul@chromium.org>,
        Satendra Singh Thakur <satendra.t@samsung.com>
Subject: Re: [PATCH] Fixes: fc2a69f3903d ("drm/atomic: Handling the case when, setting old crtc for plane")
In-Reply-To: <279cbe23-ed68-2729-bba9-61953a65a1cb@hohmatik.de>
References: <279cbe23-ed68-2729-bba9-61953a65a1cb@hohmatik.de>
Date: Wed, 05 Sep 2018 12:23:52 +0300
Message-ID: <871sa82t7b.fsf@intel.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>


Subject: Revert "drm/atomic: Handling the case when setting old crtc for plane"

On Wed, 05 Sep 2018, Karsten Hohmeier <karsten@hohmatik.de> wrote:
> Original commit causes "plane A assertion failure" on lid close/lid open
> with older HP Compaq 6720s laptops (Intel Mobile GME965/GLE960).
> Full bug report at "https://bugs.freedesktop.org/show_bug.cgi?id=107827".

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107827
Fixes: fc2a69f3903d ("drm/atomic: Handling the case when setting old crtc for plane")
Cc: Satendra Singh Thakur <satendra.t@samsung.com>
Cc: Madhur Verma <madhur.verma@samsung.com>
Cc: Hemanshu Srivastava <hemanshu.s@samsung.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v4.18+

> ---
>  drivers/gpu/drm/drm_atomic.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 895741e9cd7d..a59ded403657 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -1433,9 +1433,7 @@ drm_atomic_set_crtc_for_plane(struct
> drm_plane_state *plane_state,
>  {
>  	struct drm_plane *plane = plane_state->plane;
>  	struct drm_crtc_state *crtc_state;
> -	/* Nothing to do for same crtc*/
> -	if (plane_state->crtc == crtc)
> -		return 0;
> +
>  	if (plane_state->crtc) {
>  		crtc_state = drm_atomic_get_crtc_state(plane_state->state,
>  						       plane_state->crtc);
> --
> 2.11.0
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Jani Nikula, Intel Open Source Graphics Center