Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3697fd50 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 55aa914e b9196395

drivers/gpu/drm/radeon/atombios_encoders.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {