Commit 675a0957 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.16-2021-12-08' of... 

Merge tag 'amd-drm-fixes-5.16-2021-12-08' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.16-2021-12-08:

amdgpu:
- DPIA fix
- eDP fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211209042824.6720-1-alexander.deucher@amd.com
parents 233bee7e 0755c38e

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

+6 −1
Original line number Diff line number Diff line
@@ -2576,6 +2576,7 @@ static int dm_resume(void *handle) 
		 */

		link_enc_cfg_init(dm->dc, dc_state);



		if (dc_enable_dmub_notifications(adev->dm.dc))

			amdgpu_dm_outbox_init(adev);



		r = dm_dmub_hw_init(adev);
@@ -2625,6 +2626,10 @@ static int dm_resume(void *handle) 
	/* TODO: Remove dc_state->dccg, use dc->dccg directly. */

	dc_resource_state_construct(dm->dc, dm_state->context);



	/* Re-enable outbox interrupts for DPIA. */

	if (dc_enable_dmub_notifications(adev->dm.dc))

		amdgpu_dm_outbox_init(adev);



	/* Before powering on DC we need to re-initialize DMUB. */

	r = dm_dmub_hw_init(adev);

	if (r)

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

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ static inline void get_edp_links(const struct dc *dc, 
	*edp_num = 0;

	for (i = 0; i < dc->link_count; i++) {

		// report any eDP links, even unconnected DDI's

		if (!dc->links[i])

			continue;

		if (dc->links[i]->connector_signal == SIGNAL_TYPE_EDP) {

			edp_links[*edp_num] = dc->links[i];

			if (++(*edp_num) == MAX_NUM_EDP)