Commit e83db774 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gmc9: fix mmhub client mapping for arcturus 



The hw interface changed on arcturus so the old numbering
scheme doesn't work.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 137aac26

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

+32 −34
Original line number Diff line number Diff line
@@ -239,46 +239,44 @@ static const char *mmhub_client_ids_vega20[][2] = { 
};



static const char *mmhub_client_ids_arcturus[][2] = {

	[0][0] = "DBGU1",

	[1][0] = "XDP",

	[2][0] = "MP1",

	[3][0] = "MP0",

	[10][0] = "UTCL2",

	[13][0] = "OSS",

	[14][0] = "HDP",

	[15][0] = "SDMA0",

	[32+15][0] = "SDMA1",

	[64+15][0] = "SDMA2",

	[96+15][0] = "SDMA3",

	[128+15][0] = "SDMA4",

	[160+11][0] = "JPEG",

	[160+12][0] = "VCN",

	[160+13][0] = "VCNU",

	[160+15][0] = "SDMA5",

	[192+10][0] = "UTCL2",

	[192+11][0] = "JPEG1",

	[192+12][0] = "VCN1",

	[192+13][0] = "VCN1U",

	[192+15][0] = "SDMA6",

	[224+15][0] = "SDMA7",

	[171][0] = "JPEG",

	[172][0] = "VCN",

	[173][0] = "VCNU",

	[203][0] = "JPEG1",

	[204][0] = "VCN1",

	[205][0] = "VCN1U",

	[256][0] = "SDMA0",

	[257][0] = "SDMA1",

	[258][0] = "SDMA2",

	[259][0] = "SDMA3",

	[260][0] = "SDMA4",

	[261][0] = "SDMA5",

	[262][0] = "SDMA6",

	[263][0] = "SDMA7",

	[384][0] = "OSS",

	[0][1] = "DBGU1",

	[1][1] = "XDP",

	[2][1] = "MP1",

	[3][1] = "MP0",

	[13][1] = "OSS",

	[14][1] = "HDP",

	[15][1] = "SDMA0",

	[32+15][1] = "SDMA1",

	[64+15][1] = "SDMA2",

	[96+15][1] = "SDMA3",

	[128+15][1] = "SDMA4",

	[160+11][1] = "JPEG",

	[160+12][1] = "VCN",

	[160+13][1] = "VCNU",

	[160+15][1] = "SDMA5",

	[192+11][1] = "JPEG1",

	[192+12][1] = "VCN1",

	[192+13][1] = "VCN1U",

	[192+15][1] = "SDMA6",

	[224+15][1] = "SDMA7",

	[171][1] = "JPEG",

	[172][1] = "VCN",

	[173][1] = "VCNU",

	[203][1] = "JPEG1",

	[204][1] = "VCN1",

	[205][1] = "VCN1U",

	[256][1] = "SDMA0",

	[257][1] = "SDMA1",

	[258][1] = "SDMA2",

	[259][1] = "SDMA3",

	[260][1] = "SDMA4",

	[261][1] = "SDMA5",

	[262][1] = "SDMA6",

	[263][1] = "SDMA7",

	[384][1] = "OSS",

};



static const struct soc15_reg_golden golden_settings_mmhub_1_0_0[] =