Skip to content

Commit 9812433

Browse files
author
Roland Scheidegger
committed
drm/vmwgfx/ldu: Use drm_mode_config_reset
Same problem as in stdu, same fix. Fixes: 51f644b ("drm/atomic-helper: reset vblank on crtc reset") Acked-by: Charmaine Lee <[email protected]> Reviewed-by: Zack Rusin <[email protected]> Signed-off-by: Roland Scheidegger <[email protected]>
1 parent 1338441 commit 9812433

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
387387
ldu->base.is_implicit = true;
388388

389389
/* Initialize primary plane */
390-
vmw_du_plane_reset(primary);
391-
392390
ret = drm_universal_plane_init(dev, &ldu->base.primary,
393391
0, &vmw_ldu_plane_funcs,
394392
vmw_primary_plane_formats,
@@ -402,8 +400,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
402400
drm_plane_helper_add(primary, &vmw_ldu_primary_plane_helper_funcs);
403401

404402
/* Initialize cursor plane */
405-
vmw_du_plane_reset(cursor);
406-
407403
ret = drm_universal_plane_init(dev, &ldu->base.cursor,
408404
0, &vmw_ldu_cursor_funcs,
409405
vmw_cursor_plane_formats,
@@ -417,7 +413,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
417413

418414
drm_plane_helper_add(cursor, &vmw_ldu_cursor_plane_helper_funcs);
419415

420-
vmw_du_connector_reset(connector);
421416
ret = drm_connector_init(dev, connector, &vmw_legacy_connector_funcs,
422417
DRM_MODE_CONNECTOR_VIRTUAL);
423418
if (ret) {
@@ -445,7 +440,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
445440
goto err_free_encoder;
446441
}
447442

448-
vmw_du_crtc_reset(crtc);
449443
ret = drm_crtc_init_with_planes(dev, crtc, &ldu->base.primary,
450444
&ldu->base.cursor,
451445
&vmw_legacy_crtc_funcs, NULL);
@@ -520,6 +514,8 @@ int vmw_kms_ldu_init_display(struct vmw_private *dev_priv)
520514

521515
dev_priv->active_display_unit = vmw_du_legacy;
522516

517+
drm_mode_config_reset(dev);
518+
523519
DRM_INFO("Legacy Display Unit initialized\n");
524520

525521
return 0;

0 commit comments

Comments
 (0)