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

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

v2: program CP_ME_IC_BASE_CNTL to default value
v3: switch to use amdgpu_bo_create_reserved to create me 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 85cb0e0755bbba6af21581e10d73dd0629f4d352..9d0ef6a6aab6302ea2e9f3f6f456ea3e22ad6df9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
@@ -207,12 +207,19 @@ struct amdgpu_ce {
        uint32_t                        *ce_fw_ptr;
 };
 
+struct amdgpu_me {
+       struct amdgpu_bo                *me_fw_obj;
+       uint64_t                        me_fw_gpu_addr;
+       uint32_t                        *me_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_me                me;
        struct amdgpu_mec               mec;
        struct amdgpu_kiq               kiq;
        struct amdgpu_scratch           scratch;