[PATCH] Fixes: fc2a69f3903d ("drm/atomic: Handling the case when, setting old crtc for plane")

Karsten Hohmeier
2018-09-04T22:26:27Z

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".
---
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);