]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/vmwgfx: don't check for old_crtc_state enable status
authorDeepak Rawat <drawat@vmware.com>
Thu, 13 Sep 2018 10:33:49 +0000 (12:33 +0200)
committerThomas Hellstrom <thellstrom@vmware.com>
Thu, 20 Sep 2018 06:00:02 +0000 (08:00 +0200)
During atomic check to prepare the new topology no need to check if
old_crtc_state was enabled or not. This will cause atomic_check to fail
because due to connector routing a crtc can be in atomic_state even if
there was no change to enable status.

Detected this issue with igt run.

Signed-off-by: Deepak Rawat <drawat@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

index 23beff5d8e3c37e6904314db295cc9896657a38f..636b962849c8275c6267be41fb67e83ff32ba362 100644 (file)
@@ -1615,7 +1615,7 @@ static int vmw_kms_check_topology(struct drm_device *dev,
                struct drm_connector_state *conn_state;
                struct vmw_connector_state *vmw_conn_state;
 
-               if (!new_crtc_state->enable && old_crtc_state->enable) {
+               if (!new_crtc_state->enable) {
                        rects[i].x1 = 0;
                        rects[i].y1 = 0;
                        rects[i].x2 = 0;