Attachment 126818 Details for Bug 97471 – possible fix

[patch] possible fix

0001-drm-amdgpu-disable-HPD-for-local-panels.patch (text/plain), 8.67 KB, created by Alex Deucher on 2016-09-27 23:01:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2016-09-27 23:01:56 UTC

Size: 8.67 KB

patch

obsolete

>From 027836ec41716926f16ef1e4a641028c88454898 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Tue, 27 Sep 2016 19:00:34 -0400
>Subject: [PATCH] drm/amdgpu: disable HPD for local panels
>
>bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=97471
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 23 +++++++++-------
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 23 +++++++++-------
> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c  | 48 +++++++++++++++++++++++++++-------
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c  | 48 +++++++++++++++++++++++++++-------
> 4 files changed, 104 insertions(+), 38 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
>index 9a63d77..55e346e 100644
>--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
>+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
>@@ -427,16 +427,6 @@ static void dce_v10_0_hpd_init(struct amdgpu_device *adev)
> 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> 		struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);
> 
>-		if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
>-		    connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
>-			/* don't try to enable hpd on eDP or LVDS avoid breaking the
>-			 * aux dp channel on imac and help (but not completely fix)
>-			 * https://bugzilla.redhat.com/show_bug.cgi?id=726143
>-			 * also avoid interrupt storms during dpms.
>-			 */
>-			continue;
>-		}
>-
> 		switch (amdgpu_connector->hpd.hpd) {
> 		case AMDGPU_HPD_1:
> 			idx = 0;
>@@ -460,6 +450,19 @@ static void dce_v10_0_hpd_init(struct amdgpu_device *adev)
> 			continue;
> 		}
> 
>+		if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
>+		    connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
>+			/* don't try to enable hpd on eDP or LVDS avoid breaking the
>+			 * aux dp channel on imac and help (but not completely fix)
>+			 * https://bugzilla.redhat.com/show_bug.cgi?id=726143
>+			 * also avoid interrupt storms during dpms.
>+			 */
>+			tmp = RREG32(mmDC_HPD_INT_CONTROL + hpd_offsets[idx]);
>+			tmp = REG_SET_FIELD(tmp, DC_HPD_INT_CONTROL, DC_HPD_INT_EN, 0);
>+			WREG32(mmDC_HPD_INT_CONTROL + hpd_offsets[idx], tmp);
>+			continue;
>+		}
>+
> 		tmp = RREG32(mmDC_HPD_CONTROL + hpd_offsets[idx]);
> 		tmp = REG_SET_FIELD(tmp, DC_HPD_CONTROL, DC_HPD_EN, 1);
> 		WREG32(mmDC_HPD_CONTROL + hpd_offsets[idx], tmp);
>diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
>index a35ac3a..5f26024 100644
>--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
>+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
>@@ -443,16 +443,6 @@ static void dce_v11_0_hpd_init(struct amdgpu_device *adev)
> 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> 		struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);
> 
>-		if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
>-		    connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
>-			/* don't try to enable hpd on eDP or LVDS avoid breaking the
>-			 * aux dp channel on imac and help (but not completely fix)
>-			 * https://bugzilla.redhat.com/show_bug.cgi?id=726143
>-			 * also avoid interrupt storms during dpms.
>-			 */
>-			continue;
>-		}
>-
> 		switch (amdgpu_connector->hpd.hpd) {
> 		case AMDGPU_HPD_1:
> 			idx = 0;
>@@ -476,6 +466,19 @@ static void dce_v11_0_hpd_init(struct amdgpu_device *adev)
> 			continue;
> 		}
> 
>+		if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
>+		    connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
>+			/* don't try to enable hpd on eDP or LVDS avoid breaking the
>+			 * aux dp channel on imac and help (but not completely fix)
>+			 * https://bugzilla.redhat.com/show_bug.cgi?id=726143
>+			 * also avoid interrupt storms during dpms.
>+			 */
>+			tmp = RREG32(mmDC_HPD_INT_CONTROL + hpd_offsets[idx]);
>+			tmp = REG_SET_FIELD(tmp, DC_HPD_INT_CONTROL, DC_HPD_INT_EN, 0);
>+			WREG32(mmDC_HPD_INT_CONTROL + hpd_offsets[idx], tmp);
>+			continue;
>+		}
>+
> 		tmp = RREG32(mmDC_HPD_CONTROL + hpd_offsets[idx]);
> 		tmp = REG_SET_FIELD(tmp, DC_HPD_CONTROL, DC_HPD_EN, 1);
> 		WREG32(mmDC_HPD_CONTROL + hpd_offsets[idx], tmp);
>diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
>index eb8f96a..fce9256 100644
>--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
>+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
>@@ -375,15 +375,6 @@ static void dce_v6_0_hpd_init(struct amdgpu_device *adev)
> 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> 		struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);
> 
>-		if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
>-		    connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
>-			/* don't try to enable hpd on eDP or LVDS avoid breaking the
>-			 * aux dp channel on imac and help (but not completely fix)
>-			 * https://bugzilla.redhat.com/show_bug.cgi?id=726143
>-			 * also avoid interrupt storms during dpms.
>-			 */
>-			continue;
>-		}
> 		switch (amdgpu_connector->hpd.hpd) {
> 		case AMDGPU_HPD_1:
> 			WREG32(DC_HPD1_CONTROL, tmp);
>@@ -406,6 +397,45 @@ static void dce_v6_0_hpd_init(struct amdgpu_device *adev)
> 		default:
> 			break;
> 		}
>+
>+		if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
>+		    connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
>+			/* don't try to enable hpd on eDP or LVDS avoid breaking the
>+			 * aux dp channel on imac and help (but not completely fix)
>+			 * https://bugzilla.redhat.com/show_bug.cgi?id=726143
>+			 * also avoid interrupt storms during dpms.
>+			 */
>+			u32 dc_hpd_int_cntl_reg, dc_hpd_int_cntl;
>+
>+			switch (amdgpu_connector->hpd.hpd) {
>+			case AMDGPU_HPD_1:
>+				dc_hpd_int_cntl_reg = DC_HPD1_INT_CONTROL;
>+				break;
>+			case AMDGPU_HPD_2:
>+				dc_hpd_int_cntl_reg = DC_HPD2_INT_CONTROL;
>+				break;
>+			case AMDGPU_HPD_3:
>+				dc_hpd_int_cntl_reg = DC_HPD3_INT_CONTROL;
>+				break;
>+			case AMDGPU_HPD_4:
>+				dc_hpd_int_cntl_reg = DC_HPD4_INT_CONTROL;
>+				break;
>+			case AMDGPU_HPD_5:
>+				dc_hpd_int_cntl_reg = DC_HPD5_INT_CONTROL;
>+				break;
>+			case AMDGPU_HPD_6:
>+				dc_hpd_int_cntl_reg = DC_HPD6_INT_CONTROL;
>+				break;
>+			default:
>+				continue;
>+			}
>+
>+			dc_hpd_int_cntl = RREG32(dc_hpd_int_cntl_reg);
>+			dc_hpd_int_cntl &= ~DC_HPDx_INT_EN;
>+			WREG32(dc_hpd_int_cntl_reg, dc_hpd_int_cntl);
>+			continue;
>+		}
>+
> 		dce_v6_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd);
> 		amdgpu_irq_get(adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd);
> 	}
>diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
>index 3e1e3d0..c6c4e07 100644
>--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
>+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
>@@ -397,15 +397,6 @@ static void dce_v8_0_hpd_init(struct amdgpu_device *adev)
> 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> 		struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);
> 
>-		if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
>-		    connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
>-			/* don't try to enable hpd on eDP or LVDS avoid breaking the
>-			 * aux dp channel on imac and help (but not completely fix)
>-			 * https://bugzilla.redhat.com/show_bug.cgi?id=726143
>-			 * also avoid interrupt storms during dpms.
>-			 */
>-			continue;
>-		}
> 		switch (amdgpu_connector->hpd.hpd) {
> 		case AMDGPU_HPD_1:
> 			WREG32(mmDC_HPD1_CONTROL, tmp);
>@@ -428,6 +419,45 @@ static void dce_v8_0_hpd_init(struct amdgpu_device *adev)
> 		default:
> 			break;
> 		}
>+
>+		if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
>+		    connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
>+			/* don't try to enable hpd on eDP or LVDS avoid breaking the
>+			 * aux dp channel on imac and help (but not completely fix)
>+			 * https://bugzilla.redhat.com/show_bug.cgi?id=726143
>+			 * also avoid interrupt storms during dpms.
>+			 */
>+			u32 dc_hpd_int_cntl_reg, dc_hpd_int_cntl;
>+
>+			switch (amdgpu_connector->hpd.hpd) {
>+			case AMDGPU_HPD_1:
>+				dc_hpd_int_cntl_reg = mmDC_HPD1_INT_CONTROL;
>+				break;
>+			case AMDGPU_HPD_2:
>+				dc_hpd_int_cntl_reg = mmDC_HPD2_INT_CONTROL;
>+				break;
>+			case AMDGPU_HPD_3:
>+				dc_hpd_int_cntl_reg = mmDC_HPD3_INT_CONTROL;
>+				break;
>+			case AMDGPU_HPD_4:
>+				dc_hpd_int_cntl_reg = mmDC_HPD4_INT_CONTROL;
>+				break;
>+			case AMDGPU_HPD_5:
>+				dc_hpd_int_cntl_reg = mmDC_HPD5_INT_CONTROL;
>+				break;
>+			case AMDGPU_HPD_6:
>+				dc_hpd_int_cntl_reg = mmDC_HPD6_INT_CONTROL;
>+				break;
>+			default:
>+				continue;
>+			}
>+
>+			dc_hpd_int_cntl = RREG32(dc_hpd_int_cntl_reg);
>+			dc_hpd_int_cntl &= ~DC_HPD1_INT_CONTROL__DC_HPD1_INT_EN_MASK;
>+			WREG32(dc_hpd_int_cntl_reg, dc_hpd_int_cntl);
>+			continue;
>+		}
>+
> 		dce_v8_0_hpd_set_polarity(adev, amdgpu_connector->hpd.hpd);
> 		amdgpu_irq_get(adev, &adev->hpd_irq, amdgpu_connector->hpd.hpd);
> 	}
>-- 
>2.5.5
>

Actions: View | Splinter Review

Attachments on bug 97471: 126008 | 126111 | 126818

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.