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

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

drm/radeon/kms: only enable HDMI mode if radeon audio is enabled 

Force DVI mode if the user specifies radeon.audio=0.  The driver
doesn't handle HDMI mode properly in some cases.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=27731



Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent 6bba2e11

drivers/gpu/drm/radeon/radeon_encoders.c

+3 −3
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
	switch (connector->connector_type) {

	case DRM_MODE_CONNECTOR_DVII:

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

		if (drm_detect_monitor_audio(radeon_connector->edid)) {

		if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {

			/* fix me */

			if (ASIC_IS_DCE4(rdev))

				return ATOM_ENCODER_MODE_DVI;
@@ -655,7 +655,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
	case DRM_MODE_CONNECTOR_DVID:

	case DRM_MODE_CONNECTOR_HDMIA:

	default:

		if (drm_detect_monitor_audio(radeon_connector->edid)) {

		if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {

			/* fix me */

			if (ASIC_IS_DCE4(rdev))

				return ATOM_ENCODER_MODE_DVI;
@@ -673,7 +673,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
		if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||

		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))

			return ATOM_ENCODER_MODE_DP;

		else if (drm_detect_monitor_audio(radeon_connector->edid)) {

		else if (drm_detect_monitor_audio(radeon_connector->edid) && radeon_audio) {

			/* fix me */

			if (ASIC_IS_DCE4(rdev))

				return ATOM_ENCODER_MODE_DVI;