Commit 95e875bd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.17-2022-02-09' of... 

Merge tag 'amd-drm-fixes-5.17-2022-02-09' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.17-2022-02-09:

amdgpu:
- DCN 3.1 display fixes
- GC 10.3.1 harvest fix
- Page flip irq fix
- hwmon label fix
- DCN 2.0 display fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220210041137.5926-1-alexander.deucher@amd.com
parents 78306438 6e7545dd

drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c

+6 −1
Original line number Diff line number Diff line
@@ -543,7 +543,9 @@ static void gfxhub_v2_1_utcl2_harvest(struct amdgpu_device *adev) 
		adev->gfx.config.max_sh_per_se *

		adev->gfx.config.max_shader_engines);



	if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 3, 3)) {

	switch (adev->ip_versions[GC_HWIP][0]) {

	case IP_VERSION(10, 3, 1):

	case IP_VERSION(10, 3, 3):

		/* Get SA disabled bitmap from eFuse setting */

		efuse_setting = RREG32_SOC15(GC, 0, mmCC_GC_SA_UNIT_DISABLE);

		efuse_setting &= CC_GC_SA_UNIT_DISABLE__SA_DISABLE_MASK;
@@ -566,6 +568,9 @@ static void gfxhub_v2_1_utcl2_harvest(struct amdgpu_device *adev) 
		disabled_sa = tmp;



		WREG32_SOC15(GC, 0, mmGCUTCL2_HARVEST_BYPASS_GROUPS_YELLOW_CARP, disabled_sa);

		break;

	default:

		break;

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -3653,7 +3653,7 @@ static int dcn10_register_irq_handlers(struct amdgpu_device *adev) 


	/* Use GRPH_PFLIP interrupt */

	for (i = DCN_1_0__SRCID__HUBP0_FLIP_INTERRUPT;

			i <= DCN_1_0__SRCID__HUBP0_FLIP_INTERRUPT + adev->mode_info.num_crtc - 1;

			i <= DCN_1_0__SRCID__HUBP0_FLIP_INTERRUPT + dc->caps.max_otg_num - 1;

			i++) {

		r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_DCE, i, &adev->pageflip_irq);

		if (r) {

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

+5 −1
Original line number Diff line number Diff line
@@ -120,6 +120,10 @@ static int dcn31_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, 
	result = dcn31_smu_wait_for_response(clk_mgr, 10, 200000);



	if (result == VBIOSSMC_Result_Failed) {

		if (msg_id == VBIOSSMC_MSG_TransferTableDram2Smu &&

		    param == TABLE_WATERMARKS)

			DC_LOG_WARNING("Watermarks table not configured properly by SMU");

		else

			ASSERT(0);

		REG_WRITE(MP1_SMN_C2PMSG_91, VBIOSSMC_Result_OK);

		return -1;

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

+2 −0
Original line number Diff line number Diff line
@@ -1220,6 +1220,8 @@ struct dc *dc_create(const struct dc_init_data *init_params) 


		dc->caps.max_dp_protocol_version = DP_VERSION_1_4;



		dc->caps.max_otg_num = dc->res_pool->res_cap->num_timing_generator;



		if (dc->res_pool->dmcu != NULL)

			dc->versions.dmcu_version = dc->res_pool->dmcu->dmcu_version;

	}

drivers/gpu/drm/amd/display/dc/dc.h

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ struct dc_caps { 
	bool edp_dsc_support;

	bool vbios_lttpr_aware;

	bool vbios_lttpr_enable;

	uint32_t max_otg_num;

};



struct dc_bug_wa {