diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-10-24 16:52:20 +0900 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-11-25 22:57:02 -0500 |
| commit | 1b15bd7396897e2f8018f863dd18006092a4deb0 (patch) | |
| tree | 28fdc4e1a51e34e4b3f00b48521e777baf1f26e4 /drivers/gpu/drm/radeon/radeon_dp_auxch.c | |
| parent | 5bc028b10d041cb5340e5c87d4bc22e6b9e452d4 (diff) | |
Revert "drm/radeon: fix DP link training issue with second 4K monitor"
[ Upstream commit 9dc79965b21967caebde575f5f5d8bf1aa2c23ab ]
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
Cc: stable@vger.kernel.org
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: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_dp_auxch.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_dp_auxch.c b/drivers/gpu/drm/radeon/radeon_dp_auxch.c index db64e0062689..3b0c229d7dcd 100644 --- 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_dp_aux *aux, struct drm_dp_aux_msg *msg 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); |