From: Xiaojie Yuan Date: Tue, 11 Jun 2019 03:16:54 +0000 (+0800) Subject: drm/amdgpu/gfx10: add placeholder for navi12 golden settings X-Git-Tag: v5.4-rc1~106^2~17^2~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=716e9bb099c52efe5290c0b1f329e855b453663a;p=thirdparty%2Flinux.git drm/amdgpu/gfx10: add placeholder for navi12 golden settings Not used yet. Signed-off-by: Xiaojie Yuan Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c index 94bae62911fc2..754a212f4381e 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c @@ -174,6 +174,11 @@ static const struct soc15_reg_golden golden_settings_gc_10_1_nv14[] = /* Pending on emulation bring up */ }; +static const struct soc15_reg_golden golden_settings_gc_10_1_nv12[] = +{ + /* Pending on emulation bring up */ +}; + #define DEFAULT_SH_MEM_CONFIG \ ((SH_MEM_ADDRESS_MODE_64 << SH_MEM_CONFIG__ADDRESS_MODE__SHIFT) | \ (SH_MEM_ALIGNMENT_MODE_UNALIGNED << SH_MEM_CONFIG__ALIGNMENT_MODE__SHIFT) | \ @@ -323,6 +328,14 @@ static void gfx_v10_0_init_golden_registers(struct amdgpu_device *adev) golden_settings_gc_10_1_nv14, (const u32)ARRAY_SIZE(golden_settings_gc_10_1_nv14)); break; + case CHIP_NAVI12: + soc15_program_register_sequence(adev, + golden_settings_gc_10_1, + (const u32)ARRAY_SIZE(golden_settings_gc_10_1)); + soc15_program_register_sequence(adev, + golden_settings_gc_10_1_nv12, + (const u32)ARRAY_SIZE(golden_settings_gc_10_1_nv12)); + break; default: break; }