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

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

drm/radeon/kms: fix tv dac conflict resolver 



On systems with the tv dac shared between DVI and TV,
we can only use the dac for one of the connectors.
However, when using a digital monitor on the DVI port,
you can use the dac for the TV connector just fine.
Check the use_digital status when resolving the conflict.

Fixes fdo bug 27649, possibly others.

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

drivers/gpu/drm/radeon/radeon_connectors.c

+5 −0
Original line number Diff line number Diff line
@@ -162,12 +162,14 @@ radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector, 
{

	struct drm_device *dev = connector->dev;

	struct drm_connector *conflict;

	struct radeon_connector *radeon_conflict;

	int i;



	list_for_each_entry(conflict, &dev->mode_config.connector_list, head) {

		if (conflict == connector)

			continue;



		radeon_conflict = to_radeon_connector(conflict);

		for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

			if (conflict->encoder_ids[i] == 0)

				break;
@@ -177,6 +179,9 @@ radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector, 
				if (conflict->status != connector_status_connected)

					continue;



				if (radeon_conflict->use_digital)

					continue;



				if (priority == true) {

					DRM_INFO("1: conflicting encoders switching off %s\n", drm_get_connector_name(conflict));

					DRM_INFO("in favor of %s\n", drm_get_connector_name(connector));