[AMD Official Use Only - General]
Reviewed-by: Roman Li <Roman.Li@xxxxxxx>
> -----Original Message-----
> From: Zhang, Yifan <Yifan1.Zhang@xxxxxxx>
> Sent: Thursday, August 4, 2022 4:49 AM
> To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Li, Roman <Roman.Li@xxxxxxx>; Huang, Tim <Tim.Huang@xxxxxxx>;
> Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Du, Xiaojian
> <Xiaojian.Du@xxxxxxx>; Zhang, Yifan <Yifan1.Zhang@xxxxxxx>
> Subject: [PATCH] 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@xxxxxxx>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 4 ++--
> drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 4 ++--
> drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +-
> drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +-
> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +-
> drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +-
> drivers/gpu/drm/amd/display/include/dal_asic_id.h | 2 +-
> 7 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> index 516739bc0a96..3b4bf131bab1 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
> @@ -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);
> break;
> 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);
> break;
> }
> @@ -1408,7 +1408,7 @@ static bool
> dm_plane_format_mod_supported(struct drm_plane *plane,
> }
> break;
> 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)) {
> case AMD_FMT_MOD_TILE_GFX11_256K_R_X:
> case AMD_FMT_MOD_TILE_GFX9_64K_R_X:
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
> b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
> index 4c76091fd1f2..f276abb63bcd 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
> @@ -337,7 +337,7 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context
> *ctx, struct pp_smu_funcs *p
> 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);
>
> if (clk_mgr == NULL) {
> @@ -397,7 +397,7 @@ void dc_destroy_clk_mgr(struct clk_mgr
> *clk_mgr_base)
> dcn32_clk_mgr_destroy(clk_mgr);
> break;
>
> - case AMDGPU_FAMILY_GC_11_0_2:
> + case AMDGPU_FAMILY_GC_11_0_1:
> dcn314_clk_mgr_destroy(clk_mgr);
> break;
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c
> b/drivers/gpu/drm/amd/display/dc/core/dc.c
> index e42f44fc1c08..5d84adb6ea52 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
> @@ -4292,7 +4292,7 @@ bool dc_is_dmub_outbox_supported(struct dc
> *dc)
> !dc->debug.dpia_debug.bits.disable_dpia)
> 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)
> return true;
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
> b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
> index 9e51338441d0..66d2ae7aacf5 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
> @@ -3372,7 +3372,7 @@ bool dc_link_setup_psr(struct dc_link *link,
> switch(link->ctx->asic_id.chip_family) {
> case FAMILY_YELLOW_CARP:
> 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)
> psr_context-
> >psr_level.bits.SKIP_CRTC_DISABLE = false;
> break;
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index ffc0f1c0ea93..7dbab15bfa68 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -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))
> dc_version = DCN_VERSION_3_21;
> break;
> - case AMDGPU_FAMILY_GC_11_0_2:
> + case AMDGPU_FAMILY_GC_11_0_1:
> dc_version = DCN_VERSION_3_14;
> break;
> default:
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> index 468a893ff785..aedff18aff56 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> @@ -2153,7 +2153,7 @@ static bool dcn31_resource_construct(
> 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;
>
> /* Audio, Stream Encoders including HPO and virtual, MPC 3D LUTs */
> diff --git a/drivers/gpu/drm/amd/display/include/dal_asic_id.h
> b/drivers/gpu/drm/amd/display/include/dal_asic_id.h
> index ab06c7fc7452..e054f3494087 100644
> --- a/drivers/gpu/drm/amd/display/include/dal_asic_id.h
> +++ b/drivers/gpu/drm/amd/display/include/dal_asic_id.h
> @@ -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 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_2_A0 0x10
> #define GC_11_UNKNOWN 0xFF
> --
> 2.37.1
