diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-02 17:27:41 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-03 05:30:33 -0400 |
commit | 947978fa64e6550766f3a890fcba977f7b04c448 (patch) | |
tree | d84dd331281a85f83fc35c693421e6b04dc1594f /drivers/gpu/drm | |
parent | df92b1e679d0ea682f14cdf476f98abb071a3228 (diff) |
drm/i915: remove leaky eDP functions
Jesse Barnes noticed in his review of my DP cleanup series that
intel_edp_target_clock is now unused. Checking related code I've
noticed that also intel_edp_link_config is long unused.
Kill them both.
Wrt leaky eDP functions used in the common crtc code, the only thing
still left is intel_encoder_is_pch_edp. That one is just due to the
massive confusion between eDP vs. DP and port A vs. port D. Crtc code
should at most concern itself with the later, never with the former.
But that's material for another patch series.
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 23 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 3 |
2 files changed, 0 insertions, 26 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 88a09e9fe58b..5c1674dd5d48 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -109,29 +109,6 @@ bool intel_encoder_is_pch_edp(struct drm_encoder *encoder) | |||
109 | 109 | ||
110 | static void intel_dp_link_down(struct intel_dp *intel_dp); | 110 | static void intel_dp_link_down(struct intel_dp *intel_dp); |
111 | 111 | ||
112 | void | ||
113 | intel_edp_link_config(struct intel_encoder *intel_encoder, | ||
114 | int *lane_num, int *link_bw) | ||
115 | { | ||
116 | struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base); | ||
117 | |||
118 | *lane_num = intel_dp->lane_count; | ||
119 | *link_bw = drm_dp_bw_code_to_link_rate(intel_dp->link_bw); | ||
120 | } | ||
121 | |||
122 | int | ||
123 | intel_edp_target_clock(struct intel_encoder *intel_encoder, | ||
124 | struct drm_display_mode *mode) | ||
125 | { | ||
126 | struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base); | ||
127 | struct intel_connector *intel_connector = intel_dp->attached_connector; | ||
128 | |||
129 | if (intel_connector->panel.fixed_mode) | ||
130 | return intel_connector->panel.fixed_mode->clock; | ||
131 | else | ||
132 | return mode->clock; | ||
133 | } | ||
134 | |||
135 | static int | 112 | static int |
136 | intel_dp_max_link_bw(struct intel_dp *intel_dp) | 113 | intel_dp_max_link_bw(struct intel_dp *intel_dp) |
137 | { | 114 | { |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 1de525857f32..5cf521ba6285 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -492,9 +492,6 @@ extern void ironlake_edp_panel_on(struct intel_dp *intel_dp); | |||
492 | extern void ironlake_edp_panel_off(struct intel_dp *intel_dp); | 492 | extern void ironlake_edp_panel_off(struct intel_dp *intel_dp); |
493 | extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); | 493 | extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); |
494 | extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); | 494 | extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); |
495 | extern void intel_edp_link_config(struct intel_encoder *, int *, int *); | ||
496 | extern int intel_edp_target_clock(struct intel_encoder *, | ||
497 | struct drm_display_mode *mode); | ||
498 | extern bool intel_encoder_is_pch_edp(struct drm_encoder *encoder); | 495 | extern bool intel_encoder_is_pch_edp(struct drm_encoder *encoder); |
499 | extern int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); | 496 | extern int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); |
500 | extern void intel_flush_display_plane(struct drm_i915_private *dev_priv, | 497 | extern void intel_flush_display_plane(struct drm_i915_private *dev_priv, |