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

Commit 1cbcca30 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: don't allow audio on DCE6 



It's not supported yet.  Fixes display issues when
users force it on.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 65337e60

drivers/gpu/drm/radeon/atombios_encoders.c

+8 −3
Original line number Diff line number Diff line
@@ -667,6 +667,8 @@ atombios_digital_setup(struct drm_encoder *encoder, int action) 
int

atombios_get_encoder_mode(struct drm_encoder *encoder)

{

	struct drm_device *dev = encoder->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct drm_connector *connector;

	struct radeon_connector *radeon_connector;
@@ -693,7 +695,8 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
	case DRM_MODE_CONNECTOR_DVII:

	case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */

		if (drm_detect_hdmi_monitor(radeon_connector->edid) &&

		    radeon_audio)

		    radeon_audio &&

		    !ASIC_IS_DCE6(rdev)) /* remove once we support DCE6 */

			return ATOM_ENCODER_MODE_HDMI;

		else if (radeon_connector->use_digital)

			return ATOM_ENCODER_MODE_DVI;
@@ -704,7 +707,8 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
	case DRM_MODE_CONNECTOR_HDMIA:

	default:

		if (drm_detect_hdmi_monitor(radeon_connector->edid) &&

		    radeon_audio)

		    radeon_audio &&

		    !ASIC_IS_DCE6(rdev)) /* remove once we support DCE6 */

			return ATOM_ENCODER_MODE_HDMI;

		else

			return ATOM_ENCODER_MODE_DVI;
@@ -718,7 +722,8 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))

			return ATOM_ENCODER_MODE_DP;

		else if (drm_detect_hdmi_monitor(radeon_connector->edid) &&

			 radeon_audio)

			 radeon_audio &&

			 !ASIC_IS_DCE6(rdev)) /* remove once we support DCE6 */

			return ATOM_ENCODER_MODE_HDMI;

		else

			return ATOM_ENCODER_MODE_DVI;