lkml.org 
[lkml]   [2021]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 095/152] drm/msm: Call msm_init_vram before binding the gpu
    Date
    From: Craig Tatlor <ctatlor97@gmail.com>

    [ Upstream commit d863f0c7b536288e2bd40cbc01c10465dd226b11 ]

    vram.size is needed when binding a gpu without an iommu and is defined
    in msm_init_vram(), so run that before binding it.

    Signed-off-by: Craig Tatlor <ctatlor97@gmail.com>
    Reviewed-by: Brian Masney <masneyb@onstation.org>
    Tested-by: Alexey Minnekhanov <alexeymin@postmarketos.org>
    Signed-off-by: Rob Clark <robdclark@chromium.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/msm/msm_drv.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
    index 49685571dc0ee..d556c353e5aea 100644
    --- a/drivers/gpu/drm/msm/msm_drv.c
    +++ b/drivers/gpu/drm/msm/msm_drv.c
    @@ -444,14 +444,14 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)

    drm_mode_config_init(ddev);

    - /* Bind all our sub-components: */
    - ret = component_bind_all(dev, ddev);
    + ret = msm_init_vram(ddev);
    if (ret)
    goto err_destroy_mdss;

    - ret = msm_init_vram(ddev);
    + /* Bind all our sub-components: */
    + ret = component_bind_all(dev, ddev);
    if (ret)
    - goto err_msm_uninit;
    + goto err_destroy_mdss;

    dma_set_max_seg_size(dev, UINT_MAX);

    --
    2.27.0


    \
     
     \ /
      Last update: 2021-01-18 15:25    [W:3.921 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site