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

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

drm/radeon/kms: fallback to default connector table 



if necessary for combios

Some early combios radeon cards don't have a connector
table or dac table in the bios, if they do not, fallback
to the default tables.

Should fix kernel bug 14963.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0786201d

drivers/gpu/drm/radeon/radeon_display.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -329,8 +329,11 @@ static bool radeon_setup_enc_conn(struct drm_device *dev) 
				ret = radeon_get_atom_connector_info_from_object_table(dev);

				ret = radeon_get_atom_connector_info_from_object_table(dev);

			else

			else

				ret = radeon_get_atom_connector_info_from_supported_devices_table(dev);

				ret = radeon_get_atom_connector_info_from_supported_devices_table(dev);

		} else

		} else {

			ret = radeon_get_legacy_connector_info_from_bios(dev);

			ret = radeon_get_legacy_connector_info_from_bios(dev);

			if (ret == false)

				ret = radeon_get_legacy_connector_info_from_table(dev);

		}

	} else {

	} else {

		if (!ASIC_IS_AVIVO(rdev))

		if (!ASIC_IS_AVIVO(rdev))

			ret = radeon_get_legacy_connector_info_from_table(dev);

			ret = radeon_get_legacy_connector_info_from_table(dev);