diff options
| author |   Dave Airlie <airlied@redhat.com> | 2012-11-16 10:00:24 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-16 10:00:24 +1000 |
| commit | 3697fd50a561f3b0ddcd1404edb7b81cb696e5e0 (patch) | |
| tree | 192bbf503d948d6ba827c1d460eee6e8af06d3ca | |
| parent | drm/ttm: remove unneeded preempt_disable/enable (diff) | |
| parent | drm/radeon: fix logic error in atombios_encoders.c (diff) | |
| download | linux-dev-3697fd50a561f3b0ddcd1404edb7b81cb696e5e0.tar.xz linux-dev-3697fd50a561f3b0ddcd1404edb7b81cb696e5e0.zip | |
Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Just a single radeon fix from Alex.
* 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: fix logic error in atombios_encoders.c
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_encoders.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index ba498f8e47a2..010bae19554a 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c @@ -1625,7 +1625,7 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode) atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_SETUP, 0, 0); atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0); /* some early dce3.2 boards have a bug in their transmitter control table */ - if ((rdev->family != CHIP_RV710) || (rdev->family != CHIP_RV730)) + if ((rdev->family != CHIP_RV710) && (rdev->family != CHIP_RV730)) atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0); } if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && connector) { |