Commit 7abb543f authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: Fix build with KMS disabled 



When commit 98290b0a ("drm/msm: make it possible to disable
KMS-related code.") was rebased on top of commit 3bebfd53 ("drm/msm:
Defer VMA unmap for fb unpins"), the additional use of msm_kms was
overlooked, resulting in a build break when KMS is disabled.  Add some
additional ifdef to fix that.

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 98290b0a ("drm/msm: make it possible to disable KMS-related code.")
Signed-off-by: default avatarRob Clark <robin.clark@oss.qualcomm.com>
Tested-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarJessica Zhang <jessica.zhang@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/663240/
parent bb324f85

drivers/gpu/drm/msm/msm_gem.c

+8 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ void msm_gem_vma_get(struct drm_gem_object *obj) 
void msm_gem_vma_put(struct drm_gem_object *obj)

{

	struct msm_drm_private *priv = obj->dev->dev_private;

	struct drm_exec exec;



	if (atomic_dec_return(&to_msm_bo(obj)->vma_ref))

		return;
@@ -104,9 +103,13 @@ void msm_gem_vma_put(struct drm_gem_object *obj) 
	if (!priv->kms)

		return;



#ifdef CONFIG_DRM_MSM_KMS

	struct drm_exec exec;



	msm_gem_lock_vm_and_obj(&exec, obj, priv->kms->vm);

	put_iova_spaces(obj, priv->kms->vm, true, "vma_put");

	drm_exec_fini(&exec);     /* drop locks */

#endif

}



/*
@@ -664,9 +667,13 @@ int msm_gem_set_iova(struct drm_gem_object *obj, 


static bool is_kms_vm(struct drm_gpuvm *vm)

{

#ifdef CONFIG_DRM_MSM_KMS

	struct msm_drm_private *priv = vm->drm->dev_private;



	return priv->kms && (priv->kms->vm == vm);

#else

	return false;

#endif

}



/*