drm/radeon: Replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi
Subsystems (2)
PATCH 1/1 drm/radeon: Replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi
Replace drm_detect_hdmi_monitor() with drm_display_info.is_hdmi for more efficiency
Tested on "Oland [Radeon HD 8570 / R7 240/340 OEM]" & "Caicos [R5 230]"
Signed-off-by hongao <[email protected]>
--- drivers/gpu/drm/radeon/atombios_encoders.c | 6 +++--- drivers/gpu/drm/radeon/radeon_connectors.c | 12 ++++++------ drivers/gpu/drm/radeon/radeon_display.c | 2 +- drivers/gpu/drm/radeon/radeon_encoders.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/radeon/atombios_encoders.c +3 -3
@@ -714,7 +714,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)if (radeon_connector->use_digital && (radeon_connector->audio ==RADEON_AUDIO_ENABLE ))return ATOM_ENCODER_MODE_HDMI ; -else if (drm_detect_hdmi_monitor (radeon_connector_edid (connector)) && +else if (connector->display_info.is_hdmi && (radeon_connector->audio ==RADEON_AUDIO_AUTO ))return ATOM_ENCODER_MODE_HDMI ;else if (radeon_connector->use_digital)
@@ -733,7 +733,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)if (radeon_audio !=0 ) {if (radeon_connector->audio ==RADEON_AUDIO_ENABLE )return ATOM_ENCODER_MODE_HDMI ; -else if (drm_detect_hdmi_monitor (radeon_connector_edid (connector)) && +else if (connector->display_info.is_hdmi && (radeon_connector->audio ==RADEON_AUDIO_AUTO ))return ATOM_ENCODER_MODE_HDMI ;else
@@ -757,7 +757,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) }else if (radeon_audio !=0 ) {if (radeon_connector->audio ==RADEON_AUDIO_ENABLE )return ATOM_ENCODER_MODE_HDMI ; -else if (drm_detect_hdmi_monitor (radeon_connector_edid (connector)) && +else if (connector->display_info.is_hdmi && (radeon_connector->audio ==RADEON_AUDIO_AUTO ))return ATOM_ENCODER_MODE_HDMI ;else
drivers/gpu/drm/radeon/radeon_connectors.c +6 -6
@@ -130,7 +130,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)case DRM_MODE_CONNECTOR_DVII :case DRM_MODE_CONNECTOR_HDMIB :if (radeon_connector->use_digital) { -if (drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (connector->display_info.is_hdmi) {if (connector->display_info.bpc) bpc = connector->display_info.bpc; }
@@ -138,7 +138,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)break ;case DRM_MODE_CONNECTOR_DVID :case DRM_MODE_CONNECTOR_HDMIA : -if (drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (connector->display_info.is_hdmi) {if (connector->display_info.bpc) bpc = connector->display_info.bpc; }
@@ -147,7 +147,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector) dig_connector = radeon_connector->con_priv;if ((dig_connector->dp_sink_type ==CONNECTOR_OBJECT_ID_DISPLAYPORT ) || (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP) || -drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { + connector->display_info.is_hdmi) {if (connector->display_info.bpc) bpc = connector->display_info.bpc; }
@@ -171,7 +171,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)break ; } -if (drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (connector->display_info.is_hdmi) {/* hdmi deep color only implemented on DCE4+ */ if ((bpc >8 ) && !ASIC_IS_DCE4 (rdev)) { DRM_DEBUG("%s: HDMI deep color %d bpc unsupported. Using 8 bpc.\n",
@@ -1500,7 +1500,7 @@ static enum drm_mode_status radeon_dvi_mode_valid(struct drm_connector *connecto (radeon_connector->connector_object_id ==CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D ) || (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_B)) return MODE_OK; - else if (ASIC_IS_DCE6(rdev) && drm_detect_hdmi_monitor(radeon_connector_edid(connector))) { + else if (ASIC_IS_DCE6(rdev) && connector->display_info.is_hdmi) {/* HDMI 1.3+ supports max clock of 340 Mhz */ if (mode->clock >340000 )return MODE_CLOCK_HIGH ;
@@ -1808,7 +1808,7 @@ static enum drm_mode_status radeon_dp_mode_valid(struct drm_connector *connector (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) { return radeon_dp_mode_valid_helper(connector, mode); } else { -if (ASIC_IS_DCE6 (rdev) &&drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (ASIC_IS_DCE6 (rdev) && connector->display_info.is_hdmi) {/* HDMI 1.3+ supports max clock of 340 Mhz */ if (mode->clock >340000 )return MODE_CLOCK_HIGH ;
drivers/gpu/drm/radeon/radeon_display.c +1 -1
@@ -1728,7 +1728,7 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc, (!(mode->flags &DRM_MODE_FLAG_INTERLACE )) && ((radeon_encoder->underscan_type ==UNDERSCAN_ON ) || ((radeon_encoder->underscan_type ==UNDERSCAN_AUTO ) && -drm_detect_hdmi_monitor (radeon_connector_edid (connector)) && + connector->display_info.is_hdmi && is_hdtv_mode(mode)))) { if (radeon_encoder->underscan_hborder != 0) radeon_crtc->h_border = radeon_encoder->underscan_hborder;
drivers/gpu/drm/radeon/radeon_encoders.c +2 -2
@@ -383,7 +383,7 @@ bool radeon_dig_monitor_is_duallink(struct drm_encoder *encoder,case DRM_MODE_CONNECTOR_HDMIB :if (radeon_connector->use_digital) {/* HDMI 1.3 supports up to 340 Mhz over single link */ -if (ASIC_IS_DCE6 (rdev) &&drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (ASIC_IS_DCE6 (rdev) && connector->display_info.is_hdmi) {if (pixel_clock >340000 )return true;else
@@ -408,7 +408,7 @@ bool radeon_dig_monitor_is_duallink(struct drm_encoder *encoder,return false; else {/* HDMI 1.3 supports up to 340 Mhz over single link */ -if (ASIC_IS_DCE6 (rdev) &&drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (ASIC_IS_DCE6 (rdev) && connector->display_info.is_hdmi) {if (pixel_clock >340000 )return true;else
Signature · 1 line
2.20.1
Quoted 5 lines · hongao
Replace
drm_detect_hdmi_monitor()with drm_display_info.is_hdmi for more efficiencyTested on "Oland [Radeon HD 8570 / R7 240/340 OEM]" & "Caicos [R5 230]"
Can you verify that drm_display_info.is_hdmi has been populated when all of these functions are called?
Alex
Quoted 139 lines
Signed-off-by hongao <[email protected]>--- drivers/gpu/drm/radeon/atombios_encoders.c | 6 +++--- drivers/gpu/drm/radeon/radeon_connectors.c | 12 ++++++------ drivers/gpu/drm/radeon/radeon_display.c | 2 +- drivers/gpu/drm/radeon/radeon_encoders.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)drivers/gpu/drm/radeon/atombios_encoders.c +3
-3@@ -714,7 +714,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)if (radeon_connector->use_digital && (radeon_connector->audio ==RADEON_AUDIO_ENABLE ))return ATOM_ENCODER_MODE_HDMI ; -else if (drm_detect_hdmi_monitor (radeon_connector_edid (connector)) && +else if (connector->display_info.is_hdmi && (radeon_connector->audio ==RADEON_AUDIO_AUTO ))return ATOM_ENCODER_MODE_HDMI ;else if (radeon_connector->use_digital)@@ -733,7 +733,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)if (radeon_audio !=0 ) {if (radeon_connector->audio ==RADEON_AUDIO_ENABLE )return ATOM_ENCODER_MODE_HDMI ; -else if (drm_detect_hdmi_monitor (radeon_connector_edid (connector)) && +else if (connector->display_info.is_hdmi && (radeon_connector->audio ==RADEON_AUDIO_AUTO ))return ATOM_ENCODER_MODE_HDMI ;else @@ -757,7 +757,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) }else if (radeon_audio !=0 ) {if (radeon_connector->audio ==RADEON_AUDIO_ENABLE )return ATOM_ENCODER_MODE_HDMI ; -else if (drm_detect_hdmi_monitor (radeon_connector_edid (connector)) && +else if (connector->display_info.is_hdmi && (radeon_connector->audio ==RADEON_AUDIO_AUTO ))return ATOM_ENCODER_MODE_HDMI ;else drivers/gpu/drm/radeon/radeon_connectors.c +6
-6@@ -130,7 +130,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)case DRM_MODE_CONNECTOR_DVII :case DRM_MODE_CONNECTOR_HDMIB :if (radeon_connector->use_digital) { -if (drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (connector->display_info.is_hdmi) {if (connector->display_info.bpc) bpc = connector->display_info.bpc; }@@ -138,7 +138,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)break ;case DRM_MODE_CONNECTOR_DVID :case DRM_MODE_CONNECTOR_HDMIA : -if (drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (connector->display_info.is_hdmi) {if (connector->display_info.bpc) bpc = connector->display_info.bpc; }@@ -147,7 +147,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector) dig_connector = radeon_connector->con_priv;if ((dig_connector->dp_sink_type ==CONNECTOR_OBJECT_ID_DISPLAYPORT ) || (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP) || -drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { + connector->display_info.is_hdmi) {if (connector->display_info.bpc) bpc = connector->display_info.bpc; }@@ -171,7 +171,7 @@ int radeon_get_monitor_bpc(struct drm_connector *connector)break ; } -if (drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (connector->display_info.is_hdmi) {/* hdmi deep color only implemented on DCE4+ */ if ((bpc >8 ) && !ASIC_IS_DCE4 (rdev)) { DRM_DEBUG("%s: HDMI deep color %d bpc unsupported. Using 8 bpc.\n",@@ -1500,7 +1500,7 @@ static enum drm_mode_status radeon_dvi_mode_valid(struct drm_connector *connecto (radeon_connector->connector_object_id ==CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D ) || (radeon_connector->connector_object_id == CONNECTOR_OBJECT_ID_HDMI_TYPE_B)) return MODE_OK; - else if (ASIC_IS_DCE6(rdev) && drm_detect_hdmi_monitor(radeon_connector_edid(connector))) { + else if (ASIC_IS_DCE6(rdev) && connector->display_info.is_hdmi) {/* HDMI 1.3+ supports max clock of 340 Mhz */ if (mode->clock >340000 )return MODE_CLOCK_HIGH ;@@ -1808,7 +1808,7 @@ static enum drm_mode_status radeon_dp_mode_valid(struct drm_connector *connector (radeon_dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP)) { return radeon_dp_mode_valid_helper(connector, mode); } else { -if (ASIC_IS_DCE6 (rdev) &&drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (ASIC_IS_DCE6 (rdev) && connector->display_info.is_hdmi) {/* HDMI 1.3+ supports max clock of 340 Mhz */ if (mode->clock >340000 )return MODE_CLOCK_HIGH ;drivers/gpu/drm/radeon/radeon_display.c +1
-1@@ -1728,7 +1728,7 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc, (!(mode->flags &DRM_MODE_FLAG_INTERLACE )) && ((radeon_encoder->underscan_type ==UNDERSCAN_ON ) || ((radeon_encoder->underscan_type ==UNDERSCAN_AUTO ) && -drm_detect_hdmi_monitor (radeon_connector_edid (connector)) && + connector->display_info.is_hdmi && is_hdtv_mode(mode)))) { if (radeon_encoder->underscan_hborder != 0) radeon_crtc->h_border = radeon_encoder->underscan_hborder;drivers/gpu/drm/radeon/radeon_encoders.c +2
-3@@ -383,7 +383,7 @@ bool radeon_dig_monitor_is_duallink(struct drm_encoder *encoder,case DRM_MODE_CONNECTOR_HDMIB :if (radeon_connector->use_digital) {/* HDMI 1.3 supports up to 340 Mhz over single link */ -if (ASIC_IS_DCE6 (rdev) &&drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (ASIC_IS_DCE6 (rdev) && connector->display_info.is_hdmi) {if (pixel_clock >340000 )return true;else @@ -408,7 +408,7 @@ bool radeon_dig_monitor_is_duallink(struct drm_encoder *encoder,return false; else {/* HDMI 1.3 supports up to 340 Mhz over single link */ -if (ASIC_IS_DCE6 (rdev) &&drm_detect_hdmi_monitor (radeon_connector_edid (connector))) { +if (ASIC_IS_DCE6 (rdev) && connector->display_info.is_hdmi) {if (pixel_clock >340000 )return true;else --2.20.1