drm/msm: Call msm_init_vram before binding the gpu
[ Upstream commit d863f0c7b5
]
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>
5.4-rM2-2.2.x-imx-squashed
parent
0251d3eb44
commit
ba74e0f222
|
@ -432,15 +432,15 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)
|
||||||
|
|
||||||
drm_mode_config_init(ddev);
|
drm_mode_config_init(ddev);
|
||||||
|
|
||||||
|
ret = msm_init_vram(ddev);
|
||||||
|
if (ret)
|
||||||
|
goto err_destroy_mdss;
|
||||||
|
|
||||||
/* Bind all our sub-components: */
|
/* Bind all our sub-components: */
|
||||||
ret = component_bind_all(dev, ddev);
|
ret = component_bind_all(dev, ddev);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_destroy_mdss;
|
goto err_destroy_mdss;
|
||||||
|
|
||||||
ret = msm_init_vram(ddev);
|
|
||||||
if (ret)
|
|
||||||
goto err_msm_uninit;
|
|
||||||
|
|
||||||
if (!dev->dma_parms) {
|
if (!dev->dma_parms) {
|
||||||
dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
|
dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
|
|
Loading…
Reference in New Issue