Commit 6cefa31e authored by Iskren Chernev's avatar Iskren Chernev Committed by Rob Clark
Browse files

drm/msm: Fix MSM_INFO_GET_IOVA with carveout 



The msm_gem_get_iova should be guarded with gpu != NULL and not aspace
!= NULL, because aspace is NULL when using vram carveout.

Fixes: 933415e2 ("drm/msm: Add support for private address space instances")

Signed-off-by: default avatarIskren Chernev <iskren.chernev@gmail.com>
Tested-by: default avatarAlexey Minnekhanov <alexeymin@postmarketos.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent fe7952c6

drivers/gpu/drm/msm/msm_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -788,9 +788,10 @@ static int msm_ioctl_gem_info_iova(struct drm_device *dev, 
		struct drm_file *file, struct drm_gem_object *obj,

		uint64_t *iova)

{

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_file_private *ctx = file->driver_priv;



	if (!ctx->aspace)

	if (!priv->gpu)

		return -EINVAL;



	/*