Commit 08ebadfc authored Aug 04, 2022 by Yifan Zhang Committed by Alex Deucher Aug 10, 2022

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>

parent 616699d7

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		@@ -1412,7 +1412,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:

drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

drivers/gpu/drm/amd/display/dc/core/dc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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: