summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorCraig Tatlor <ctatlor97@gmail.com>2020-12-30 17:29:42 +0200
committerRob Clark <robdclark@chromium.org>2021-01-07 09:12:53 -0800
commitd863f0c7b536288e2bd40cbc01c10465dd226b11 (patch)
tree1e515daa2bd9736dc1155ff875b50c3f2463db06 /drivers
parent2b5f09cadfc576817c0450e01d454f750909b103 (diff)
downloadlinux-d863f0c7b536288e2bd40cbc01c10465dd226b11.tar.bz2
drm/msm: Call msm_init_vram before binding the gpu
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/msm/msm_drv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index ce9bb6e929c2..549ffb60e9ca 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -457,14 +457,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);