diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:26:07 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:26:07 +0800 |
commit | 9440e4b9fa1c6d76f3c8e11e0887218c9894bf4b (patch) | |
tree | 940d9ee8e703936e48ba43c40d3e3488c54a30f7 /drivers/gpu/drm/radeon/radeon_dp_auxch.c | |
parent | 4eed929a29a419e367b75ff5e4ab3800d4ce35dd (diff) | |
parent | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (diff) |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.12-rt
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); |