Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
drm/radeon/kms: only enable hdmi features if the monitor supports audio
This avoids some issues in the current hdmi audio code for monitors
without audio.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
authored by Alex Deucher and committed by Dave Airlie c268cd36 c3307cd6
+3
-3
drivers/gpu/drm/radeon/radeon_encoders.c
+3
-3
drivers/gpu/drm/radeon/radeon_encoders.c
···
641
switch (connector->connector_type) {
642
case DRM_MODE_CONNECTOR_DVII:
643
case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
644
-
if (drm_detect_hdmi_monitor(radeon_connector->edid)) {
645
/* fix me */
646
if (ASIC_IS_DCE4(rdev))
647
return ATOM_ENCODER_MODE_DVI;
···
655
case DRM_MODE_CONNECTOR_DVID:
656
case DRM_MODE_CONNECTOR_HDMIA:
657
default:
658
-
if (drm_detect_hdmi_monitor(radeon_connector->edid)) {
659
/* fix me */
660
if (ASIC_IS_DCE4(rdev))
661
return ATOM_ENCODER_MODE_DVI;
···
673
if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
674
(dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
675
return ATOM_ENCODER_MODE_DP;
676
-
else if (drm_detect_hdmi_monitor(radeon_connector->edid)) {
677
/* fix me */
678
if (ASIC_IS_DCE4(rdev))
679
return ATOM_ENCODER_MODE_DVI;
···
641
switch (connector->connector_type) {
642
case DRM_MODE_CONNECTOR_DVII:
643
case DRM_MODE_CONNECTOR_HDMIB: /* HDMI-B is basically DL-DVI; analog works fine */
644
+
if (drm_detect_monitor_audio(radeon_connector->edid)) {
645
/* fix me */
646
if (ASIC_IS_DCE4(rdev))
647
return ATOM_ENCODER_MODE_DVI;
···
655
case DRM_MODE_CONNECTOR_DVID:
656
case DRM_MODE_CONNECTOR_HDMIA:
657
default:
658
+
if (drm_detect_monitor_audio(radeon_connector->edid)) {
659
/* fix me */
660
if (ASIC_IS_DCE4(rdev))
661
return ATOM_ENCODER_MODE_DVI;
···
673
if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
674
(dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
675
return ATOM_ENCODER_MODE_DP;
676
+
else if (drm_detect_monitor_audio(radeon_connector->edid)) {
677
/* fix me */
678
if (ASIC_IS_DCE4(rdev))
679
return ATOM_ENCODER_MODE_DVI;