diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-20 12:16:37 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-20 12:16:37 +0800 |
| commit | 510d0a3f869611dcd001a2b7627fa5dded4579af (patch) | |
| tree | ba06ce27af2f3aa194a268e3f26f0665c21357a9 /drivers/gpu/drm/radeon/radeon_dp_auxch.c | |
| parent | e37ddf27108a992e191b27df9bd532cb9157dc89 (diff) | |
| parent | 544ec5b08d007f184ab97abdbed87e613c8c0b83 (diff) | |
Merge tag 'v4.4.11' into linux-linaro-lsk-v4.4lsk-v4.4-16.05
This is the 4.4.11 stable release
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); |