Commit d863f0c7 authored by Craig Tatlor's avatar Craig Tatlor Committed by Rob Clark
Browse files

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: default avatarCraig Tatlor <ctatlor97@gmail.com>
Reviewed-by: default avatarBrian Masney <masneyb@onstation.org>
Tested-by: default avatarAlexey Minnekhanov <alexeymin@postmarketos.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 2b5f09ca

drivers/gpu/drm/msm/msm_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -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);