Skip to content

Commit

Permalink
drm/vmwgfx/ldu: Use drm_mode_config_reset
Browse files Browse the repository at this point in the history
commit 9812433 upstream.

Same problem as in stdu, same fix.

Fixes: 51f644b ("drm/atomic-helper: reset vblank on crtc reset")
Acked-by: Charmaine Lee <charmainel@vmware.com>
Reviewed-by: Zack Rusin <zackr@vmware.com>
Signed-off-by: Roland Scheidegger <sroland@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Roland Scheidegger authored and gregkh committed Sep 3, 2020
1 parent 01736d3 commit f880d69
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
Expand Up @@ -387,8 +387,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
ldu->base.is_implicit = true;

/* Initialize primary plane */
vmw_du_plane_reset(primary);

ret = drm_universal_plane_init(dev, &ldu->base.primary,
0, &vmw_ldu_plane_funcs,
vmw_primary_plane_formats,
Expand All @@ -402,8 +400,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
drm_plane_helper_add(primary, &vmw_ldu_primary_plane_helper_funcs);

/* Initialize cursor plane */
vmw_du_plane_reset(cursor);

ret = drm_universal_plane_init(dev, &ldu->base.cursor,
0, &vmw_ldu_cursor_funcs,
vmw_cursor_plane_formats,
Expand All @@ -417,7 +413,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)

drm_plane_helper_add(cursor, &vmw_ldu_cursor_plane_helper_funcs);

vmw_du_connector_reset(connector);
ret = drm_connector_init(dev, connector, &vmw_legacy_connector_funcs,
DRM_MODE_CONNECTOR_VIRTUAL);
if (ret) {
Expand Down Expand Up @@ -445,7 +440,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
goto err_free_encoder;
}

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

dev_priv->active_display_unit = vmw_du_legacy;

drm_mode_config_reset(dev);

DRM_INFO("Legacy Display Unit initialized\n");

return 0;
Expand Down

0 comments on commit f880d69

Please sign in to comment.