| Message ID | 1364938061-32619-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 2 Apr 2013 23:27:41 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > 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> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- > drivers/gpu/drm/i915/intel_drv.h | 3 --- > 2 files changed, 26 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 6bf144c..f90ce47 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) > > static void intel_dp_link_down(struct intel_dp *intel_dp); > > -void > -intel_edp_link_config(struct intel_encoder *intel_encoder, > - int *lane_num, int *link_bw) > -{ > - struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base); > - > - *lane_num = intel_dp->lane_count; > - *link_bw = drm_dp_bw_code_to_link_rate(intel_dp->link_bw); > -} > - > -int > -intel_edp_target_clock(struct intel_encoder *intel_encoder, > - struct drm_display_mode *mode) > -{ > - struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base); > - struct intel_connector *intel_connector = intel_dp->attached_connector; > - > - if (intel_connector->panel.fixed_mode) > - return intel_connector->panel.fixed_mode->clock; > - else > - return mode->clock; > -} > - > static int > intel_dp_max_link_bw(struct intel_dp *intel_dp) > { > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 094c940..2b31d7e 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -520,9 +520,6 @@ extern void ironlake_edp_panel_on(struct intel_dp *intel_dp); > extern void ironlake_edp_panel_off(struct intel_dp *intel_dp); > extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); > extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); > -extern void intel_edp_link_config(struct intel_encoder *, int *, int *); > -extern int intel_edp_target_clock(struct intel_encoder *, > - struct drm_display_mode *mode); > extern bool intel_encoder_is_pch_edp(struct drm_encoder *encoder); > extern int intel_plane_init(struct drm_device *dev, enum pipe pipe); > extern void intel_flush_display_plane(struct drm_i915_private *dev_priv, Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 6bf144c..f90ce47 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) static void intel_dp_link_down(struct intel_dp *intel_dp); -void -intel_edp_link_config(struct intel_encoder *intel_encoder, - int *lane_num, int *link_bw) -{ - struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base); - - *lane_num = intel_dp->lane_count; - *link_bw = drm_dp_bw_code_to_link_rate(intel_dp->link_bw); -} - -int -intel_edp_target_clock(struct intel_encoder *intel_encoder, - struct drm_display_mode *mode) -{ - struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base); - struct intel_connector *intel_connector = intel_dp->attached_connector; - - if (intel_connector->panel.fixed_mode) - return intel_connector->panel.fixed_mode->clock; - else - return mode->clock; -} - static int intel_dp_max_link_bw(struct intel_dp *intel_dp) { diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 094c940..2b31d7e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -520,9 +520,6 @@ extern void ironlake_edp_panel_on(struct intel_dp *intel_dp); extern void ironlake_edp_panel_off(struct intel_dp *intel_dp); extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); -extern void intel_edp_link_config(struct intel_encoder *, int *, int *); -extern int intel_edp_target_clock(struct intel_encoder *, - struct drm_display_mode *mode); extern bool intel_encoder_is_pch_edp(struct drm_encoder *encoder); extern int intel_plane_init(struct drm_device *dev, enum pipe pipe); extern void intel_flush_display_plane(struct drm_i915_private *dev_priv,
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> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- drivers/gpu/drm/i915/intel_drv.h | 3 --- 2 files changed, 26 deletions(-)