Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 621b325a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/display: Drop some new CONFIG_DRM_AMD_DC_DCN1_01 guards 



These got added back by subsequent merges accidently.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent beff74bc

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

+0 −2
Original line number Diff line number Diff line
@@ -665,13 +665,11 @@ static int load_dmcu_fw(struct amdgpu_device *adev) 
	case CHIP_VEGA20:

		return 0;

	case CHIP_RAVEN:

#if defined(CONFIG_DRM_AMD_DC_DCN1_01)

		if (ASICREV_IS_PICASSO(adev->external_rev_id))

			fw_name_dmcu = FIRMWARE_RAVEN_DMCU;

		else if (ASICREV_IS_RAVEN2(adev->external_rev_id))

			fw_name_dmcu = FIRMWARE_RAVEN_DMCU;

		else

#endif

			return 0;

		break;

	default:

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

+0 −4
Original line number Diff line number Diff line
@@ -105,14 +105,10 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p 


#if defined(CONFIG_DRM_AMD_DC_DCN1_0)

	case FAMILY_RV:



#if defined(CONFIG_DRM_AMD_DC_DCN1_01)

		if (ASICREV_IS_RAVEN2(asic_id.hw_internal_rev)) {

			rv2_clk_mgr_construct(ctx, clk_mgr, pp_smu);

			break;

		}

#endif	/* DCN1_01 */



		if (ASICREV_IS_RAVEN(asic_id.hw_internal_rev) ||

				ASICREV_IS_PICASSO(asic_id.hw_internal_rev)) {

			rv1_clk_mgr_construct(ctx, clk_mgr, pp_smu);