path: root/drivers
diff options
authorDeepak Rawat <>2018-12-21 14:38:35 -0800
committerThomas Hellstrom <>2019-02-05 13:53:28 +0100
commit479d59026fe44f89fa67efa01a4d47e00808e688 (patch)
tree22a98d5aad1cec7b33f8b3c8616929a00941ca49 /drivers
parent51fdbeb4ca1a8415c98f87cb877956ae83e71627 (diff)
drm/vmwgfx: Also check for crtc status while checking for DU active
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: <> Fixes: 9da6e26c0aae: ("drm/vmwgfx: Fix a layout race condition") Signed-off-by: Deepak Rawat <> Reviewed-by: Thomas Hellstrom <> Signed-off-by: Thomas Hellstrom <>
Diffstat (limited to 'drivers')
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 5e257a600cea..ed2f67822f45 100644
--- 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;