On Wed, Sep 05, 2018 at 12:23:52PM +0300, Jani Nikula wrote: > > Subject: Revert "drm/atomic: Handling the case when setting old crtc for plane" > > On Wed, 05 Sep 2018, Karsten Hohmeier <karsten@xxxxxxxxxxx> 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@xxxxxxxxxxx> > Cc: Madhur Verma <madhur.verma@xxxxxxxxxxx> > Cc: Hemanshu Srivastava <hemanshu.s@xxxxxxxxxxx> > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> > Cc: Gustavo Padovan <gustavo@xxxxxxxxxxx> > Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > Cc: Sean Paul <seanpaul@xxxxxxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx > Cc: <stable@xxxxxxxxxxxxxxx> # v4.18+ Karsten, we also need your signed-off-by per https://dri.freedesktop.org/docs/drm/process/submitting-patches.html?highlight=signed%20off#sign-your-work-the-developer-s-certificate-of-origin Otherwise we can't apply the patch. Just reply here is enough. Thanks, Daniel > > > --- > > 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@xxxxxxxxxxxxxxxxxxxxx > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
