Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8223286d authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm: Add a helper function for in-kernel buffer allocations 



Nearly all of the buffer allocations for kernel allocate an buffer object,
virtual address and GPU iova at the same time. Make a helper function to
handle the details.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
[dropped msm_fbdev conversion to new helper, since it interferes with
display-handover work, where we want to separate allocation and mapping]
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 1267a4df

drivers/gpu/drm/msm/adreno/a5xx_gpu.c

+4 −18
Original line number Diff line number Diff line
@@ -284,28 +284,14 @@ static int a5xx_me_init(struct msm_gpu *gpu) 
static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu,

		const struct firmware *fw, u64 *iova)

{

	struct drm_device *drm = gpu->dev;

	struct drm_gem_object *bo;

	void *ptr;



	bo = msm_gem_new_locked(drm, fw->size - 4, MSM_BO_UNCACHED);

	if (IS_ERR(bo))

		return bo;



	ptr = msm_gem_get_vaddr(bo);

	if (!ptr) {

		drm_gem_object_unreference(bo);

		return ERR_PTR(-ENOMEM);

	}



	if (iova) {

		int ret = msm_gem_get_iova(bo, gpu->aspace, iova);

	ptr = msm_gem_kernel_new_locked(gpu->dev, fw->size - 4,

		MSM_BO_UNCACHED | MSM_BO_GPU_READONLY, gpu->aspace, &bo, iova);



		if (ret) {

			drm_gem_object_unreference(bo);

			return ERR_PTR(ret);

		}

	}

	if (IS_ERR(ptr))

		return ERR_CAST(ptr);



	memcpy(ptr, &fw->data[4], fw->size - 4);

drivers/gpu/drm/msm/adreno/a5xx_power.c

+4 −10
Original line number Diff line number Diff line
@@ -294,16 +294,10 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) 
	 */

	bosize = (cmds_size + (cmds_size / TYPE4_MAX_PAYLOAD) + 1) << 2;



	a5xx_gpu->gpmu_bo = msm_gem_new_locked(drm, bosize, MSM_BO_UNCACHED);

	if (IS_ERR(a5xx_gpu->gpmu_bo))

		goto err;



	if (msm_gem_get_iova(a5xx_gpu->gpmu_bo, gpu->aspace,

			&a5xx_gpu->gpmu_iova))

		goto err;



	ptr = msm_gem_get_vaddr(a5xx_gpu->gpmu_bo);

	if (!ptr)

	ptr = msm_gem_kernel_new_locked(drm, bosize,

		MSM_BO_UNCACHED | MSM_BO_GPU_READONLY, gpu->aspace,

		&a5xx_gpu->gpmu_bo, &a5xx_gpu->gpmu_iova);

	if (IS_ERR(ptr))

		goto err;



	while (cmds_size > 0) {

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+7 −19
Original line number Diff line number Diff line
@@ -391,31 +391,19 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
		return ret;

	}



	adreno_gpu->memptrs_bo = msm_gem_new(drm, sizeof(*adreno_gpu->memptrs),

			MSM_BO_UNCACHED);

	if (IS_ERR(adreno_gpu->memptrs_bo)) {

		ret = PTR_ERR(adreno_gpu->memptrs_bo);

		adreno_gpu->memptrs_bo = NULL;

		dev_err(drm->dev, "could not allocate memptrs: %d\n", ret);

		return ret;

	}

	adreno_gpu->memptrs = msm_gem_kernel_new(drm,

		sizeof(*adreno_gpu->memptrs), MSM_BO_UNCACHED, gpu->aspace,

		&adreno_gpu->memptrs_bo, &adreno_gpu->memptrs_iova);



	adreno_gpu->memptrs = msm_gem_get_vaddr(adreno_gpu->memptrs_bo);

	if (IS_ERR(adreno_gpu->memptrs)) {

		dev_err(drm->dev, "could not vmap memptrs\n");

		return -ENOMEM;

		ret = PTR_ERR(adreno_gpu->memptrs);

		adreno_gpu->memptrs = NULL;

		dev_err(drm->dev, "could not allocate memptrs: %d\n", ret);

	}



	ret = msm_gem_get_iova(adreno_gpu->memptrs_bo, gpu->aspace,

			&adreno_gpu->memptrs_iova);

	if (ret) {

		dev_err(drm->dev, "could not map memptrs: %d\n", ret);

	return ret;

}



	return 0;

}



void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu)

{

	struct msm_gpu *gpu = &adreno_gpu->base;

drivers/gpu/drm/msm/msm_drv.h

+6 −0
Original line number Diff line number Diff line
@@ -237,6 +237,12 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev, 
		uint32_t size, uint32_t flags);

struct drm_gem_object *msm_gem_new_locked(struct drm_device *dev,

		uint32_t size, uint32_t flags);

void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size,

		uint32_t flags, struct msm_gem_address_space *aspace,

		struct drm_gem_object **bo, uint64_t *iova);

void *msm_gem_kernel_new_locked(struct drm_device *dev, uint32_t size,

		uint32_t flags, struct msm_gem_address_space *aspace,

		struct drm_gem_object **bo, uint64_t *iova);

struct drm_gem_object *msm_gem_import(struct drm_device *dev,

		struct dma_buf *dmabuf, struct sg_table *sgt);

drivers/gpu/drm/msm/msm_gem.c

+46 −0
Original line number Diff line number Diff line
@@ -1024,3 +1024,49 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, 
	drm_gem_object_unreference_unlocked(obj);

	return ERR_PTR(ret);

}



static void *_msm_gem_kernel_new(struct drm_device *dev, uint32_t size,

		uint32_t flags, struct msm_gem_address_space *aspace,

		struct drm_gem_object **bo, uint64_t *iova, bool locked)

{

	void *vaddr;

	struct drm_gem_object *obj = _msm_gem_new(dev, size, flags, locked);

	int ret;



	if (IS_ERR(obj))

		return ERR_CAST(obj);



	if (iova) {

		ret = msm_gem_get_iova(obj, aspace, iova);

		if (ret) {

			drm_gem_object_unreference(obj);

			return ERR_PTR(ret);

		}

	}



	vaddr = msm_gem_get_vaddr(obj);

	if (!vaddr) {

		msm_gem_put_iova(obj, aspace);

		drm_gem_object_unreference(obj);

		return ERR_PTR(-ENOMEM);

	}



	if (bo)

		*bo = obj;



	return vaddr;

}



void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size,

		uint32_t flags, struct msm_gem_address_space *aspace,

		struct drm_gem_object **bo, uint64_t *iova)

{

	return _msm_gem_kernel_new(dev, size, flags, aspace, bo, iova, false);

}



void *msm_gem_kernel_new_locked(struct drm_device *dev, uint32_t size,

		uint32_t flags, struct msm_gem_address_space *aspace,

		struct drm_gem_object **bo, uint64_t *iova)

{

	return _msm_gem_kernel_new(dev, size, flags, aspace, bo, iova, true);

}