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

drm/amd/display: change family id name for DCN314

GC version is 11.0.1 rather than 11.0.2

Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: Roman Li <Roman.Li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Yifan Zhang and committed by
Alex Deucher
08ebadfc 616699d7

+9 -9
+2 -2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
··· 660 660 add_gfx10_1_modifiers(adev, mods, &size, &capacity); 661 661 break; 662 662 case AMDGPU_FAMILY_GC_11_0_0: 663 - case AMDGPU_FAMILY_GC_11_0_2: 663 + case AMDGPU_FAMILY_GC_11_0_1: 664 664 add_gfx11_modifiers(adev, mods, &size, &capacity); 665 665 break; 666 666 } ··· 1412 1412 } 1413 1413 break; 1414 1414 case AMDGPU_FAMILY_GC_11_0_0: 1415 - case AMDGPU_FAMILY_GC_11_0_2: 1415 + case AMDGPU_FAMILY_GC_11_0_1: 1416 1416 switch (AMD_FMT_MOD_GET(TILE, modifier)) { 1417 1417 case AMD_FMT_MOD_TILE_GFX11_256K_R_X: 1418 1418 case AMD_FMT_MOD_TILE_GFX9_64K_R_X:
+2 -2
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
··· 337 337 break; 338 338 } 339 339 340 - case AMDGPU_FAMILY_GC_11_0_2: { 340 + case AMDGPU_FAMILY_GC_11_0_1: { 341 341 struct clk_mgr_dcn314 *clk_mgr = kzalloc(sizeof(*clk_mgr), GFP_KERNEL); 342 342 343 343 if (clk_mgr == NULL) { ··· 397 397 dcn32_clk_mgr_destroy(clk_mgr); 398 398 break; 399 399 400 - case AMDGPU_FAMILY_GC_11_0_2: 400 + case AMDGPU_FAMILY_GC_11_0_1: 401 401 dcn314_clk_mgr_destroy(clk_mgr); 402 402 break; 403 403
+1 -1
drivers/gpu/drm/amd/display/dc/core/dc.c
··· 4292 4292 !dc->debug.dpia_debug.bits.disable_dpia) 4293 4293 return true; 4294 4294 4295 - if (dc->ctx->asic_id.chip_family == AMDGPU_FAMILY_GC_11_0_2 && 4295 + if (dc->ctx->asic_id.chip_family == AMDGPU_FAMILY_GC_11_0_1 && 4296 4296 !dc->debug.dpia_debug.bits.disable_dpia) 4297 4297 return true; 4298 4298
+1 -1
drivers/gpu/drm/amd/display/dc/core/dc_link.c
··· 3372 3372 switch(link->ctx->asic_id.chip_family) { 3373 3373 case FAMILY_YELLOW_CARP: 3374 3374 case AMDGPU_FAMILY_GC_10_3_6: 3375 - case AMDGPU_FAMILY_GC_11_0_2: 3375 + case AMDGPU_FAMILY_GC_11_0_1: 3376 3376 if(!dc->debug.disable_z10) 3377 3377 psr_context->psr_level.bits.SKIP_CRTC_DISABLE = false; 3378 3378 break;
+1 -1
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
··· 169 169 if (ASICREV_IS_GC_11_0_2(asic_id.hw_internal_rev)) 170 170 dc_version = DCN_VERSION_3_21; 171 171 break; 172 - case AMDGPU_FAMILY_GC_11_0_2: 172 + case AMDGPU_FAMILY_GC_11_0_1: 173 173 dc_version = DCN_VERSION_3_14; 174 174 break; 175 175 default:
+1 -1
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
··· 2153 2153 pool->base.usb4_dpia_count = 4; 2154 2154 } 2155 2155 2156 - if (dc->ctx->asic_id.chip_family == AMDGPU_FAMILY_GC_11_0_2) 2156 + if (dc->ctx->asic_id.chip_family == AMDGPU_FAMILY_GC_11_0_1) 2157 2157 pool->base.usb4_dpia_count = 4; 2158 2158 2159 2159 /* Audio, Stream Encoders including HPO and virtual, MPC 3D LUTs */
+1 -1
drivers/gpu/drm/amd/display/include/dal_asic_id.h
··· 244 244 #define ASICREV_IS_GC_10_3_7(eChipRev) ((eChipRev >= GC_10_3_7_A0) && (eChipRev < GC_10_3_7_UNKNOWN)) 245 245 246 246 #define AMDGPU_FAMILY_GC_11_0_0 145 247 - #define AMDGPU_FAMILY_GC_11_0_2 148 247 + #define AMDGPU_FAMILY_GC_11_0_1 148 248 248 #define GC_11_0_0_A0 0x1 249 249 #define GC_11_0_2_A0 0x10 250 250 #define GC_11_UNKNOWN 0xFF