Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

+32 -34
+32 -34
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
··· 239 239 }; 240 240 241 241 static const char *mmhub_client_ids_arcturus[][2] = { 242 + [0][0] = "DBGU1", 243 + [1][0] = "XDP", 242 244 [2][0] = "MP1", 243 - [3][0] = "MP0", 244 - [10][0] = "UTCL2", 245 - [13][0] = "OSS", 246 245 [14][0] = "HDP", 247 - [15][0] = "SDMA0", 248 - [32+15][0] = "SDMA1", 249 - [64+15][0] = "SDMA2", 250 - [96+15][0] = "SDMA3", 251 - [128+15][0] = "SDMA4", 252 - [160+11][0] = "JPEG", 253 - [160+12][0] = "VCN", 254 - [160+13][0] = "VCNU", 255 - [160+15][0] = "SDMA5", 256 - [192+10][0] = "UTCL2", 257 - [192+11][0] = "JPEG1", 258 - [192+12][0] = "VCN1", 259 - [192+13][0] = "VCN1U", 260 - [192+15][0] = "SDMA6", 261 - [224+15][0] = "SDMA7", 246 + [171][0] = "JPEG", 247 + [172][0] = "VCN", 248 + [173][0] = "VCNU", 249 + [203][0] = "JPEG1", 250 + [204][0] = "VCN1", 251 + [205][0] = "VCN1U", 252 + [256][0] = "SDMA0", 253 + [257][0] = "SDMA1", 254 + [258][0] = "SDMA2", 255 + [259][0] = "SDMA3", 256 + [260][0] = "SDMA4", 257 + [261][0] = "SDMA5", 258 + [262][0] = "SDMA6", 259 + [263][0] = "SDMA7", 260 + [384][0] = "OSS", 262 261 [0][1] = "DBGU1", 263 262 [1][1] = "XDP", 264 263 [2][1] = "MP1", 265 - [3][1] = "MP0", 266 - [13][1] = "OSS", 267 264 [14][1] = "HDP", 268 - [15][1] = "SDMA0", 269 - [32+15][1] = "SDMA1", 270 - [64+15][1] = "SDMA2", 271 - [96+15][1] = "SDMA3", 272 - [128+15][1] = "SDMA4", 273 - [160+11][1] = "JPEG", 274 - [160+12][1] = "VCN", 275 - [160+13][1] = "VCNU", 276 - [160+15][1] = "SDMA5", 277 - [192+11][1] = "JPEG1", 278 - [192+12][1] = "VCN1", 279 - [192+13][1] = "VCN1U", 280 - [192+15][1] = "SDMA6", 281 - [224+15][1] = "SDMA7", 265 + [171][1] = "JPEG", 266 + [172][1] = "VCN", 267 + [173][1] = "VCNU", 268 + [203][1] = "JPEG1", 269 + [204][1] = "VCN1", 270 + [205][1] = "VCN1U", 271 + [256][1] = "SDMA0", 272 + [257][1] = "SDMA1", 273 + [258][1] = "SDMA2", 274 + [259][1] = "SDMA3", 275 + [260][1] = "SDMA4", 276 + [261][1] = "SDMA5", 277 + [262][1] = "SDMA6", 278 + [263][1] = "SDMA7", 279 + [384][1] = "OSS", 282 280 }; 283 281 284 282 static const struct soc15_reg_golden golden_settings_mmhub_1_0_0[] =