From: Marek Olšák Date: Wed, 25 Nov 2020 06:40:51 +0000 (-0500) Subject: drm/amdgpu: set LDS_CONFIG=0x20 on VanGogh to fix MGCG hang X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0c056b14d82eeb95c41b78901dbf2872de70b607;p=linux.git drm/amdgpu: set LDS_CONFIG=0x20 on VanGogh to fix MGCG hang Same as Sienna Cichlid and Navy Flounder. Signed-off-by: Marek Olšák Acked-by: Alex Deucher 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 f33e54b01d3ac..cd572d08b0ff4 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c @@ -3262,6 +3262,9 @@ static const struct soc15_reg_golden golden_settings_gc_10_3_vangogh[] = SOC15_REG_GOLDEN_VALUE(GC, 0, mmTA_CNTL_AUX, 0xfff7ffff, 0x01030000), SOC15_REG_GOLDEN_VALUE(GC, 0, mmUTCL1_CTRL, 0xffffffff, 0x00400000), SOC15_REG_GOLDEN_VALUE(GC, 0, mmVGT_GS_MAX_WAVE_ID, 0x00000fff, 0x000000ff), + + /* This is not in GDB yet. Don't remove it. It fixes a GPU hang on VanGogh. */ + SOC15_REG_GOLDEN_VALUE(GC, 0, mmLDS_CONFIG, 0x00000020, 0x00000020), }; static const struct soc15_reg_golden golden_settings_gc_10_3_4[] =