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")
Date: Wed, 05 Sep 2018 12:23:52 +0300 [thread overview]
Message-ID: <871sa82t7b.fsf@intel.com> (raw)
In-Reply-To: <279cbe23-ed68-2729-bba9-61953a65a1cb@hohmatik.de>
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
next prev parent reply other threads:[~2018-09-05 13:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-04 22:26 [PATCH] Fixes: fc2a69f3903d ("drm/atomic: Handling the case when, setting old crtc for plane") Karsten Hohmeier
2018-09-05 9:23 ` Jani Nikula [this message]
2018-09-05 9:34 ` Daniel Vetter
2018-09-05 9:36 ` Maarten Lankhorst
2018-09-05 9:37 ` Eric Engestrom
2018-09-06 4:39 ` Satendra Singh Thakur
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871sa82t7b.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hemanshu.s@samsung.com \
--cc=karsten@hohmatik.de \
--cc=madhur.verma@samsung.com \
--cc=satendra.t@samsung.com \
--cc=seanpaul@chromium.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).