diff options
author | Eric Anholt <eric@anholt.net> | 2010-04-02 18:24:27 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-04-12 12:23:30 -0400 |
commit | 6443170f6d862a1cc89e61e4bb2410b714b875f4 (patch) | |
tree | 17767306f21c95f066163d1d7df9c2a2e35bbbc9 /drivers/gpu/drm/i915/intel_dp.c | |
parent | 335af9a235a82842854b394507ab5e310d88be42 (diff) |
drm/i915: Remove dead KMS encoder save/restore code.
This was brought over from UMS, and used for a while until we decided
that drm_helper_resume_force_mode was easier and more reliable, since
it didn't require duplicating all the code deleted here. We just
forgot to delete all that junk for a while.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 6064fd70a424..8f2dd65abaca 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -47,8 +47,6 @@ struct intel_dp_priv { | |||
47 | uint32_t output_reg; | 47 | uint32_t output_reg; |
48 | uint32_t DP; | 48 | uint32_t DP; |
49 | uint8_t link_configuration[DP_LINK_CONFIGURATION_SIZE]; | 49 | uint8_t link_configuration[DP_LINK_CONFIGURATION_SIZE]; |
50 | uint32_t save_DP; | ||
51 | uint8_t save_link_configuration[DP_LINK_CONFIGURATION_SIZE]; | ||
52 | bool has_audio; | 50 | bool has_audio; |
53 | int dpms_mode; | 51 | int dpms_mode; |
54 | uint8_t link_bw; | 52 | uint8_t link_bw; |
@@ -748,20 +746,6 @@ intel_dp_link_status(uint8_t link_status[DP_LINK_STATUS_SIZE], | |||
748 | return link_status[r - DP_LANE0_1_STATUS]; | 746 | return link_status[r - DP_LANE0_1_STATUS]; |
749 | } | 747 | } |
750 | 748 | ||
751 | static void | ||
752 | intel_dp_save(struct drm_connector *connector) | ||
753 | { | ||
754 | struct intel_encoder *intel_encoder = to_intel_encoder(connector); | ||
755 | struct drm_device *dev = intel_encoder->base.dev; | ||
756 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
757 | struct intel_dp_priv *dp_priv = intel_encoder->dev_priv; | ||
758 | |||
759 | dp_priv->save_DP = I915_READ(dp_priv->output_reg); | ||
760 | intel_dp_aux_native_read(intel_encoder, DP_LINK_BW_SET, | ||
761 | dp_priv->save_link_configuration, | ||
762 | sizeof (dp_priv->save_link_configuration)); | ||
763 | } | ||
764 | |||
765 | static uint8_t | 749 | static uint8_t |
766 | intel_get_adjust_request_voltage(uint8_t link_status[DP_LINK_STATUS_SIZE], | 750 | intel_get_adjust_request_voltage(uint8_t link_status[DP_LINK_STATUS_SIZE], |
767 | int lane) | 751 | int lane) |
@@ -1101,18 +1085,6 @@ intel_dp_link_down(struct intel_encoder *intel_encoder, uint32_t DP) | |||
1101 | POSTING_READ(dp_priv->output_reg); | 1085 | POSTING_READ(dp_priv->output_reg); |
1102 | } | 1086 | } |
1103 | 1087 | ||
1104 | static void | ||
1105 | intel_dp_restore(struct drm_connector *connector) | ||
1106 | { | ||
1107 | struct intel_encoder *intel_encoder = to_intel_encoder(connector); | ||
1108 | struct intel_dp_priv *dp_priv = intel_encoder->dev_priv; | ||
1109 | |||
1110 | if (dp_priv->save_DP & DP_PORT_EN) | ||
1111 | intel_dp_link_train(intel_encoder, dp_priv->save_DP, dp_priv->save_link_configuration); | ||
1112 | else | ||
1113 | intel_dp_link_down(intel_encoder, dp_priv->save_DP); | ||
1114 | } | ||
1115 | |||
1116 | /* | 1088 | /* |
1117 | * According to DP spec | 1089 | * According to DP spec |
1118 | * 5.1.2: | 1090 | * 5.1.2: |
@@ -1267,8 +1239,6 @@ static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = { | |||
1267 | 1239 | ||
1268 | static const struct drm_connector_funcs intel_dp_connector_funcs = { | 1240 | static const struct drm_connector_funcs intel_dp_connector_funcs = { |
1269 | .dpms = drm_helper_connector_dpms, | 1241 | .dpms = drm_helper_connector_dpms, |
1270 | .save = intel_dp_save, | ||
1271 | .restore = intel_dp_restore, | ||
1272 | .detect = intel_dp_detect, | 1242 | .detect = intel_dp_detect, |
1273 | .fill_modes = drm_helper_probe_single_connector_modes, | 1243 | .fill_modes = drm_helper_probe_single_connector_modes, |
1274 | .destroy = intel_dp_destroy, | 1244 | .destroy = intel_dp_destroy, |