Skip to content

Commit 7b6df1d

Browse files
frank98753alexdeucher
authored andcommitted
drm/amdgpu: update golden regs for gfx12
update golden regs for gfx12 Signed-off-by: Frank Min <[email protected]> Reviewed-by: Likun Gao <[email protected]> Reviewed-by: Hawking Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] # 6.11.x
1 parent 042658d commit 7b6df1d

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,16 @@ static const struct amdgpu_hwip_reg_entry gc_gfx_queue_reg_list_12[] = {
202202
SOC15_REG_ENTRY_STR(GC, 0, regCP_IB1_BUFSZ)
203203
};
204204

205-
static const struct soc15_reg_golden golden_settings_gc_12_0[] = {
205+
static const struct soc15_reg_golden golden_settings_gc_12_0_rev0[] = {
206206
SOC15_REG_GOLDEN_VALUE(GC, 0, regDB_MEM_CONFIG, 0x0000000f, 0x0000000f),
207207
SOC15_REG_GOLDEN_VALUE(GC, 0, regCB_HW_CONTROL_1, 0x03000000, 0x03000000),
208208
SOC15_REG_GOLDEN_VALUE(GC, 0, regGL2C_CTRL5, 0x00000070, 0x00000020)
209209
};
210210

211+
static const struct soc15_reg_golden golden_settings_gc_12_0[] = {
212+
SOC15_REG_GOLDEN_VALUE(GC, 0, regDB_MEM_CONFIG, 0x00008000, 0x00008000),
213+
};
214+
211215
#define DEFAULT_SH_MEM_CONFIG \
212216
((SH_MEM_ADDRESS_MODE_64 << SH_MEM_CONFIG__ADDRESS_MODE__SHIFT) | \
213217
(SH_MEM_ALIGNMENT_MODE_UNALIGNED << SH_MEM_CONFIG__ALIGNMENT_MODE__SHIFT) | \
@@ -3495,10 +3499,14 @@ static void gfx_v12_0_init_golden_registers(struct amdgpu_device *adev)
34953499
switch (amdgpu_ip_version(adev, GC_HWIP, 0)) {
34963500
case IP_VERSION(12, 0, 0):
34973501
case IP_VERSION(12, 0, 1):
3502+
soc15_program_register_sequence(adev,
3503+
golden_settings_gc_12_0,
3504+
(const u32)ARRAY_SIZE(golden_settings_gc_12_0));
3505+
34983506
if (adev->rev_id == 0)
34993507
soc15_program_register_sequence(adev,
3500-
golden_settings_gc_12_0,
3501-
(const u32)ARRAY_SIZE(golden_settings_gc_12_0));
3508+
golden_settings_gc_12_0_rev0,
3509+
(const u32)ARRAY_SIZE(golden_settings_gc_12_0_rev0));
35023510
break;
35033511
default:
35043512
break;

0 commit comments

Comments
 (0)