drm/vmwgfx: Also check for crtc status while checking for DU active

deepak-rawat · thomashvmw · commit 479d59026fe4 · 2019-02-05T13:53:28.000+01:00
During modeset check it is possible to have all crtc_state's in atomic state. Check for crtc enable status while checking for display unit active status. Only error if enabling a crtc while display unit is not active. Cc: <stable@vger.kernel.org> Fixes: 9da6e26: ("drm/vmwgfx: Fix a layout race condition") Signed-off-by: Deepak Rawat <drawat@vmware.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -1646,7 +1646,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 (!du->pref_active) {
+		if (!du->pref_active && new_crtc_state->enable) {
 			ret = -EINVAL;
 			goto clean;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1646,7 +1646,7 @@ static int vmw_kms_check_topology(struct drm_device *dev,`
`1646`	`1646`	`struct drm_connector_state *conn_state;`
`1647`	`1647`	`struct vmw_connector_state *vmw_conn_state;`
`1648`	`1648`
`1649`		`- if (!du->pref_active) {`
	`1649`	`+ if (!du->pref_active && new_crtc_state->enable) {`
`1650`	`1650`	`ret = -EINVAL;`
`1651`	`1651`	`goto clean;`
`1652`	`1652`	`}`