drm/amdgpu/gfx10: new approach to load ce fw (v4)

gfx10 allows to only upload ce jumptable while save the whole
ce image at gtt memory.

v2: program CP_CE_IC_BASE_CNTL to default value
v3: switch to use amdgpu_bo_create_reserved to create ce fw bo
v4: split common code from gfx10 code

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
index 574550e9e9e80e18c736a657d8aa85acc6b3f2a1..85cb0e0755bbba6af21581e10d73dd0629f4d352 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
@@ -201,11 +201,18 @@ struct amdgpu_pfp {
        uint32_t                        *pfp_fw_ptr;
 };
 
+struct amdgpu_ce {
+       struct amdgpu_bo                *ce_fw_obj;
+       uint64_t                        ce_fw_gpu_addr;
+       uint32_t                        *ce_fw_ptr;
+};
+
 struct amdgpu_gfx {
        struct mutex                    gpu_clock_mutex;
        struct amdgpu_gfx_config        config;
        struct amdgpu_rlc               rlc;
        struct amdgpu_pfp               pfp;
+       struct amdgpu_ce                ce;
        struct amdgpu_mec               mec;
        struct amdgpu_kiq               kiq;
        struct amdgpu_scratch           scratch;