diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-10-24 16:52:20 +0900 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-10-24 17:00:26 -0400 |
| commit | 9dc79965b21967caebde575f5f5d8bf1aa2c23ab (patch) | |
| tree | 86ee40956d1191bd644e649453b457840a843d0d /drivers/gpu | |
| parent | 4560738a8e9d5c0a053b8b896487b83e6948f4a1 (diff) | |
| download | linux-stable-9dc79965b21967caebde575f5f5d8bf1aa2c23ab.tar.gz linux-stable-9dc79965b21967caebde575f5f5d8bf1aa2c23ab.tar.bz2 linux-stable-9dc79965b21967caebde575f5f5d8bf1aa2c23ab.zip | |
Revert "drm/radeon: fix DP link training issue with second 4K monitor"
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>
Diffstat (limited to 'drivers/gpu')
| -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 2d465648856a..474a8a1886f7 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); |