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: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index 517e19c3f9ed946ed380baf70a12bf006d365bc7..a4f68affc13bc4ef13ab0f7790f306cd5be21625 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -497,25 +497,6 @@ static int a5xx_preempt_start(struct msm_gpu *gpu)
        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)
 {
        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
@@ -523,7 +504,7 @@ static int a5xx_ucode_init(struct msm_gpu *gpu)
        int ret;
 
        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);
 
                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) {
-               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);
 
                if (IS_ERR(a5xx_gpu->pfp_bo)) {

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 4a8ee5ec571e4436eda56882e9396da8bbefa438..87133c6c6f91ca4046b6d1ba95ba35224d6e8b89 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -162,6 +162,25 @@ static int adreno_load_fw(struct adreno_gpu *adreno_gpu)
        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)
 {
        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
index 499092af81a2340bdbf58b86951d794c03f1691b..d6b0e7b813f403a623ad6c238888c2d530669c09 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -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);
 const struct firmware *adreno_request_fw(struct adreno_gpu *adreno_gpu,
                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);
 void adreno_recover(struct msm_gpu *gpu);
 void adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,