diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:16 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:16 +0800 |
| commit | 1d48c75353cb265710f7589f47532e1db06cb64f (patch) | |
| tree | ebfded7d10d45cfb718c76159de227b593716d5c /drivers/gpu/drm/radeon/radeon_dp_auxch.c | |
| parent | 71d97a95427b3c9c11788a8e6dd0117551d29166 (diff) | |
| parent | 0a296a966f183e4ef1fcb37940940e8df8c4f258 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.05-android
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 3b0c229d7dcd..db64e0062689 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; + tmp |= AUX_EN | AUX_LS_READ_EN | AUX_HPD_DISCON(0x1); WREG32(AUX_CONTROL + aux_offset[instance], tmp); |