| From 9dc79965b21967caebde575f5f5d8bf1aa2c23ab Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> |
| Date: Mon, 24 Oct 2016 16:52:20 +0900 |
| Subject: Revert "drm/radeon: fix DP link training issue with second 4K monitor" |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Michel Dänzer <michel.daenzer@amd.com> |
| |
| commit 9dc79965b21967caebde575f5f5d8bf1aa2c23ab upstream. |
| |
| This reverts commit 1a738347df2ee4977459a8776fe2c62196bdcb1b. |
| |
| It caused at least some Kaveri laptops to incorrectly report DisplayPort |
| connectors as connected. |
| |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97857 |
| Reviewed-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_dp_auxch.c |
| +++ b/drivers/gpu/drm/radeon/radeon_dp_auxch.c |
| @@ -105,7 +105,7 @@ radeon_dp_aux_transfer_native(struct drm |
| |
| tmp &= AUX_HPD_SEL(0x7); |
| tmp |= AUX_HPD_SEL(chan->rec.hpd); |
| - tmp |= AUX_EN | AUX_LS_READ_EN | AUX_HPD_DISCON(0x1); |
| + tmp |= AUX_EN | AUX_LS_READ_EN; |
| |
| WREG32(AUX_CONTROL + aux_offset[instance], tmp); |
| |
