lkml.org 
[lkml]   [2020]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 251/255] drm/vmwgfx/sou: Use drm_mode_config_reset
    Date
    From: Roland Scheidegger <sroland@vmware.com>

    commit 1338441cf166e2ef789af5915b961d4e13a4ec31 upstream.

    Same problem as in stdu, same fix.

    Fixes: 51f644b40b4b ("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>

    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 9 ++-------
    1 file changed, 2 insertions(+), 7 deletions(-)

    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
    @@ -859,8 +859,6 @@ static int vmw_sou_init(struct vmw_priva
    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_priva
    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_priva

    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_priva
    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_

    dev_priv->active_display_unit = vmw_du_screen_object;

    + drm_mode_config_reset(dev);
    +
    DRM_INFO("Screen Objects Display Unit initialized\n");

    return 0;

    \
     
     \ /
      Last update: 2020-09-01 17:54    [W:4.042 / U:0.524 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site