drm/vmwgfx/sou: Use drm_mode_config_reset
Subsystems (3)
PATCH 1/2 drm/vmwgfx/sou: Use drm_mode_config_reset
From: Roland Scheidegger <[email protected]>
Same problem as in stdu, same fix.
Fixes 51f644b40b4b ("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]>
--- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +2 -7
@@ -859,8 +859,6 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit) sou->base.is_implicit = false;/* Initialize primary plane */ -vmw_du_plane_reset (primary); - ret = drm_universal_plane_init(dev, &sou->base.primary, 0, &vmw_sou_plane_funcs, vmw_primary_plane_formats,
@@ -875,8 +873,6 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)drm_plane_enable_fb_damage_clips (primary);/* Initialize cursor plane */ -vmw_du_plane_reset (cursor); - ret = drm_universal_plane_init(dev, &sou->base.cursor, 0, &vmw_sou_cursor_funcs, vmw_cursor_plane_formats,
@@ -890,7 +886,6 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)drm_plane_helper_add (cursor, &vmw_sou_cursor_plane_helper_funcs); -vmw_du_connector_reset (connector); ret =drm_connector_init (dev, connector, &vmw_sou_connector_funcs,DRM_MODE_CONNECTOR_VIRTUAL );if (ret) {
@@ -918,8 +913,6 @@ static int vmw_sou_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, &sou->base.primary, &sou->base.cursor, &vmw_screen_object_crtc_funcs,NULL );
@@ -973,6 +966,8 @@ int vmw_kms_sou_init_display(struct vmw_private *dev_priv) dev_priv->active_display_unit = vmw_du_screen_object; +drm_mode_config_reset (dev); +DRM_INFO ("Screen Objects Display Unit initialized\n" );return 0 ;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/2 drm/vmwgfx/ldu: Use drm_mode_config_reset
From: Roland Scheidegger <[email protected]>
Same problem as in stdu, same fix.
Fixes 51f644b40b4b ("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]>
--- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +2 -6
@@ -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,
@@ -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,
@@ -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) {
@@ -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 );
@@ -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 ;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel