Commit 08ebadfc authored by Yifan Zhang's avatar Yifan Zhang Committed by Alex Deucher

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

GC version is 11.0.1 rather than 11.0.2
Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarRoman Li <Roman.Li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 616699d7
...@@ -660,7 +660,7 @@ static int get_plane_modifiers(struct amdgpu_device *adev, unsigned int plane_ty ...@@ -660,7 +660,7 @@ static int get_plane_modifiers(struct amdgpu_device *adev, unsigned int plane_ty
add_gfx10_1_modifiers(adev, mods, &size, &capacity); add_gfx10_1_modifiers(adev, mods, &size, &capacity);
break; break;
case AMDGPU_FAMILY_GC_11_0_0: case AMDGPU_FAMILY_GC_11_0_0:
case AMDGPU_FAMILY_GC_11_0_2: case AMDGPU_FAMILY_GC_11_0_1:
add_gfx11_modifiers(adev, mods, &size, &capacity); add_gfx11_modifiers(adev, mods, &size, &capacity);
break; break;
} }
...@@ -1412,7 +1412,7 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane, ...@@ -1412,7 +1412,7 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,
} }
break; break;
case AMDGPU_FAMILY_GC_11_0_0: case AMDGPU_FAMILY_GC_11_0_0:
case AMDGPU_FAMILY_GC_11_0_2: case AMDGPU_FAMILY_GC_11_0_1:
switch (AMD_FMT_MOD_GET(TILE, modifier)) { switch (AMD_FMT_MOD_GET(TILE, modifier)) {
case AMD_FMT_MOD_TILE_GFX11_256K_R_X: case AMD_FMT_MOD_TILE_GFX11_256K_R_X:
case AMD_FMT_MOD_TILE_GFX9_64K_R_X: case AMD_FMT_MOD_TILE_GFX9_64K_R_X:
......
...@@ -337,7 +337,7 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p ...@@ -337,7 +337,7 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p
break; break;
} }
case AMDGPU_FAMILY_GC_11_0_2: { case AMDGPU_FAMILY_GC_11_0_1: {
struct clk_mgr_dcn314 *clk_mgr = kzalloc(sizeof(*clk_mgr), GFP_KERNEL); struct clk_mgr_dcn314 *clk_mgr = kzalloc(sizeof(*clk_mgr), GFP_KERNEL);
if (clk_mgr == NULL) { if (clk_mgr == NULL) {
...@@ -397,7 +397,7 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base) ...@@ -397,7 +397,7 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base)
dcn32_clk_mgr_destroy(clk_mgr); dcn32_clk_mgr_destroy(clk_mgr);
break; break;
case AMDGPU_FAMILY_GC_11_0_2: case AMDGPU_FAMILY_GC_11_0_1:
dcn314_clk_mgr_destroy(clk_mgr); dcn314_clk_mgr_destroy(clk_mgr);
break; break;
......
...@@ -4292,7 +4292,7 @@ bool dc_is_dmub_outbox_supported(struct dc *dc) ...@@ -4292,7 +4292,7 @@ bool dc_is_dmub_outbox_supported(struct dc *dc)
!dc->debug.dpia_debug.bits.disable_dpia) !dc->debug.dpia_debug.bits.disable_dpia)
return true; return true;
if (dc->ctx->asic_id.chip_family == AMDGPU_FAMILY_GC_11_0_2 && if (dc->ctx->asic_id.chip_family == AMDGPU_FAMILY_GC_11_0_1 &&
!dc->debug.dpia_debug.bits.disable_dpia) !dc->debug.dpia_debug.bits.disable_dpia)
return true; return true;
......
...@@ -3372,7 +3372,7 @@ bool dc_link_setup_psr(struct dc_link *link, ...@@ -3372,7 +3372,7 @@ bool dc_link_setup_psr(struct dc_link *link,
switch(link->ctx->asic_id.chip_family) { switch(link->ctx->asic_id.chip_family) {
case FAMILY_YELLOW_CARP: case FAMILY_YELLOW_CARP:
case AMDGPU_FAMILY_GC_10_3_6: case AMDGPU_FAMILY_GC_10_3_6:
case AMDGPU_FAMILY_GC_11_0_2: case AMDGPU_FAMILY_GC_11_0_1:
if(!dc->debug.disable_z10) if(!dc->debug.disable_z10)
psr_context->psr_level.bits.SKIP_CRTC_DISABLE = false; psr_context->psr_level.bits.SKIP_CRTC_DISABLE = false;
break; break;
......
...@@ -169,7 +169,7 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id) ...@@ -169,7 +169,7 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
if (ASICREV_IS_GC_11_0_2(asic_id.hw_internal_rev)) if (ASICREV_IS_GC_11_0_2(asic_id.hw_internal_rev))
dc_version = DCN_VERSION_3_21; dc_version = DCN_VERSION_3_21;
break; break;
case AMDGPU_FAMILY_GC_11_0_2: case AMDGPU_FAMILY_GC_11_0_1:
dc_version = DCN_VERSION_3_14; dc_version = DCN_VERSION_3_14;
break; break;
default: default:
......
...@@ -2153,7 +2153,7 @@ static bool dcn31_resource_construct( ...@@ -2153,7 +2153,7 @@ static bool dcn31_resource_construct(
pool->base.usb4_dpia_count = 4; pool->base.usb4_dpia_count = 4;
} }
if (dc->ctx->asic_id.chip_family == AMDGPU_FAMILY_GC_11_0_2) if (dc->ctx->asic_id.chip_family == AMDGPU_FAMILY_GC_11_0_1)
pool->base.usb4_dpia_count = 4; pool->base.usb4_dpia_count = 4;
/* Audio, Stream Encoders including HPO and virtual, MPC 3D LUTs */ /* Audio, Stream Encoders including HPO and virtual, MPC 3D LUTs */
......
...@@ -244,7 +244,7 @@ enum { ...@@ -244,7 +244,7 @@ enum {
#define ASICREV_IS_GC_10_3_7(eChipRev) ((eChipRev >= GC_10_3_7_A0) && (eChipRev < GC_10_3_7_UNKNOWN)) #define ASICREV_IS_GC_10_3_7(eChipRev) ((eChipRev >= GC_10_3_7_A0) && (eChipRev < GC_10_3_7_UNKNOWN))
#define AMDGPU_FAMILY_GC_11_0_0 145 #define AMDGPU_FAMILY_GC_11_0_0 145
#define AMDGPU_FAMILY_GC_11_0_2 148 #define AMDGPU_FAMILY_GC_11_0_1 148
#define GC_11_0_0_A0 0x1 #define GC_11_0_0_A0 0x1
#define GC_11_0_2_A0 0x10 #define GC_11_0_2_A0 0x10
#define GC_11_UNKNOWN 0xFF #define GC_11_UNKNOWN 0xFF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment