drm/radeon/kms: rework DP bridge checks
[linux-2.6.git] / drivers / gpu / drm / radeon / atombios_dp.c
index 3b77ad6..f5b7bdb 100644 (file)
@@ -482,7 +482,8 @@ static int radeon_dp_get_dp_link_clock(struct drm_connector *connector,
        int bpp = convert_bpc_to_bpp(connector->display_info.bpc);
        int lane_num, max_pix_clock;
 
-       if (radeon_connector_encoder_is_dp_bridge(connector))
+       if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) !=
+           ENCODER_OBJECT_ID_NONE)
                return 270000;
 
        lane_num = radeon_dp_get_dp_lane_number(connector, dpcd, pix_clock);
@@ -559,7 +560,8 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,
        if (!ASIC_IS_DCE4(rdev))
                return;
 
-       if (radeon_connector_encoder_is_dp_bridge(connector))
+       if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) !=
+           ENCODER_OBJECT_ID_NONE)
                panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE;
        else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
                u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP);