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

Commit d3a67a43 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: disable the tv encoder when tv/cv is not in use 



Switching between TV and VGA caused VGA to break on some systems
since the TV encoder was left enabled when VGA was used.

fixes fdo bug 25520.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a1a4b23b

drivers/gpu/drm/radeon/radeon_encoders.c

+6 −2
Original line number Diff line number Diff line
@@ -1377,8 +1377,12 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, 
	case ENCODER_OBJECT_ID_INTERNAL_DAC2:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:

		atombios_dac_setup(encoder, ATOM_ENABLE);

		if (radeon_encoder->devices & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT)) {

			if (radeon_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT))

				atombios_tv_setup(encoder, ATOM_ENABLE);

			else

				atombios_tv_setup(encoder, ATOM_DISABLE);

		}

		break;

	}

	atombios_apply_encoder_quirks(encoder, adjusted_mode);