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

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

drm/radeon/kms: only expose underscan on avivo chips 



R4xx also uses the atom add connector function, but underscan is only
supported on avivo chips.

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

drivers/gpu/drm/radeon/radeon_connectors.c

+12 −9
Original line number Diff line number Diff line
@@ -1134,6 +1134,7 @@ radeon_add_atom_connector(struct drm_device *dev, 
		drm_connector_attach_property(&radeon_connector->base,

					      rdev->mode_info.coherent_mode_property,

					      1);

		if (ASIC_IS_AVIVO(rdev))

			drm_connector_attach_property(&radeon_connector->base,

						      rdev->mode_info.underscan_property,

						      UNDERSCAN_AUTO);
@@ -1162,6 +1163,7 @@ radeon_add_atom_connector(struct drm_device *dev, 
		drm_connector_attach_property(&radeon_connector->base,

					      rdev->mode_info.coherent_mode_property,

					      1);

		if (ASIC_IS_AVIVO(rdev))

			drm_connector_attach_property(&radeon_connector->base,

						      rdev->mode_info.underscan_property,

						      UNDERSCAN_AUTO);
@@ -1196,6 +1198,7 @@ radeon_add_atom_connector(struct drm_device *dev, 
		drm_connector_attach_property(&radeon_connector->base,

					      rdev->mode_info.coherent_mode_property,

					      1);

		if (ASIC_IS_AVIVO(rdev))

			drm_connector_attach_property(&radeon_connector->base,

						      rdev->mode_info.underscan_property,

						      UNDERSCAN_AUTO);

drivers/gpu/drm/radeon/radeon_encoders.c

+4 −2
Original line number Diff line number Diff line
@@ -1708,6 +1708,7 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su 
		} else {

			drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);

			radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);

			if (ASIC_IS_AVIVO(rdev))

				radeon_encoder->underscan_type = UNDERSCAN_AUTO;

		}

		drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
@@ -1738,6 +1739,7 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su 
		} else {

			drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);

			radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);

			if (ASIC_IS_AVIVO(rdev))

				radeon_encoder->underscan_type = UNDERSCAN_AUTO;

		}

		drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);