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

Commit 9de43e79 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm/adreno: Use generic function to load firmware to a buffer object 



Move a5xx specific code to load firmware into a buffer object to
the generic Adreno code. This will come in useful for future targets.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent c5e3548c

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

+2 −21
Original line number Original line Diff line number Diff line
@@ -497,25 +497,6 @@ static int a5xx_preempt_start(struct msm_gpu *gpu) 
	return a5xx_idle(gpu, ring) ? 0 : -EINVAL;

	return a5xx_idle(gpu, ring) ? 0 : -EINVAL;

}

}







static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu,

		const struct firmware *fw, u64 *iova)

{

	struct drm_gem_object *bo;

	void *ptr;



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

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



	if (IS_ERR(ptr))

		return ERR_CAST(ptr);



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



	msm_gem_put_vaddr(bo);

	return bo;

}



static int a5xx_ucode_init(struct msm_gpu *gpu)

static int a5xx_ucode_init(struct msm_gpu *gpu)

{

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
@@ -523,7 +504,7 @@ static int a5xx_ucode_init(struct msm_gpu *gpu) 
	int ret;

	int ret;





	if (!a5xx_gpu->pm4_bo) {

	if (!a5xx_gpu->pm4_bo) {

		a5xx_gpu->pm4_bo = a5xx_ucode_load_bo(gpu,

		a5xx_gpu->pm4_bo = adreno_fw_create_bo(gpu,

			adreno_gpu->fw[ADRENO_FW_PM4], &a5xx_gpu->pm4_iova);

			adreno_gpu->fw[ADRENO_FW_PM4], &a5xx_gpu->pm4_iova);





		if (IS_ERR(a5xx_gpu->pm4_bo)) {

		if (IS_ERR(a5xx_gpu->pm4_bo)) {
@@ -536,7 +517,7 @@ static int a5xx_ucode_init(struct msm_gpu *gpu) 
	}

	}





	if (!a5xx_gpu->pfp_bo) {

	if (!a5xx_gpu->pfp_bo) {

		a5xx_gpu->pfp_bo = a5xx_ucode_load_bo(gpu,

		a5xx_gpu->pfp_bo = adreno_fw_create_bo(gpu,

			adreno_gpu->fw[ADRENO_FW_PFP], &a5xx_gpu->pfp_iova);

			adreno_gpu->fw[ADRENO_FW_PFP], &a5xx_gpu->pfp_iova);





		if (IS_ERR(a5xx_gpu->pfp_bo)) {

		if (IS_ERR(a5xx_gpu->pfp_bo)) {

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

+19 −0
Original line number Original line Diff line number Diff line
@@ -162,6 +162,25 @@ static int adreno_load_fw(struct adreno_gpu *adreno_gpu) 
	return 0;

	return 0;

}

}





struct drm_gem_object *adreno_fw_create_bo(struct msm_gpu *gpu,

		const struct firmware *fw, u64 *iova)

{

	struct drm_gem_object *bo;

	void *ptr;



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

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



	if (IS_ERR(ptr))

		return ERR_CAST(ptr);



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



	msm_gem_put_vaddr(bo);



	return bo;

}



int adreno_hw_init(struct msm_gpu *gpu)

int adreno_hw_init(struct msm_gpu *gpu)

{

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -206,6 +206,8 @@ static inline int adreno_is_a530(struct adreno_gpu *gpu) 
int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value);

int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value);

const struct firmware *adreno_request_fw(struct adreno_gpu *adreno_gpu,

const struct firmware *adreno_request_fw(struct adreno_gpu *adreno_gpu,

		const char *fwname);

		const char *fwname);

struct drm_gem_object *adreno_fw_create_bo(struct msm_gpu *gpu,

		const struct firmware *fw, u64 *iova);

int adreno_hw_init(struct msm_gpu *gpu);

int adreno_hw_init(struct msm_gpu *gpu);

void adreno_recover(struct msm_gpu *gpu);

void adreno_recover(struct msm_gpu *gpu);

void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,

void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,