diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-09-16 05:29:34 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-09-17 03:25:28 -0400 |
commit | 9a0ea498ecc65b013d00e0b1c38791c4af91de61 (patch) | |
tree | 22204d7f446261db2c81c8866c142692803dc5ff /drivers/gpu/drm/i915/intel_display.c | |
parent | d6e4db15ed93e6c3857b904f33ac759d4c66fba9 (diff) |
drm/i915: garbage-collect vlv refclk function
Simply inline the 100MHz default we're using. Having gunk around that
has leftover LVDS support on a platform that just doesn't have this
isn't of any use.
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c0849569da90..15f78ffb93be 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -4306,28 +4306,6 @@ static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv) | |||
4306 | && !(dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE); | 4306 | && !(dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE); |
4307 | } | 4307 | } |
4308 | 4308 | ||
4309 | static int vlv_get_refclk(struct drm_crtc *crtc) | ||
4310 | { | ||
4311 | struct drm_device *dev = crtc->dev; | ||
4312 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
4313 | int refclk = 27000; /* for DP & HDMI */ | ||
4314 | |||
4315 | return 100000; /* only one validated so far */ | ||
4316 | |||
4317 | if (intel_pipe_has_type(crtc, INTEL_OUTPUT_ANALOG)) { | ||
4318 | refclk = 96000; | ||
4319 | } else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) { | ||
4320 | if (intel_panel_use_ssc(dev_priv)) | ||
4321 | refclk = 100000; | ||
4322 | else | ||
4323 | refclk = 96000; | ||
4324 | } else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP)) { | ||
4325 | refclk = 100000; | ||
4326 | } | ||
4327 | |||
4328 | return refclk; | ||
4329 | } | ||
4330 | |||
4331 | static int i9xx_get_refclk(struct drm_crtc *crtc, int num_connectors) | 4309 | static int i9xx_get_refclk(struct drm_crtc *crtc, int num_connectors) |
4332 | { | 4310 | { |
4333 | struct drm_device *dev = crtc->dev; | 4311 | struct drm_device *dev = crtc->dev; |
@@ -4335,7 +4313,7 @@ static int i9xx_get_refclk(struct drm_crtc *crtc, int num_connectors) | |||
4335 | int refclk; | 4313 | int refclk; |
4336 | 4314 | ||
4337 | if (IS_VALLEYVIEW(dev)) { | 4315 | if (IS_VALLEYVIEW(dev)) { |
4338 | refclk = vlv_get_refclk(crtc); | 4316 | refclk = 100000; |
4339 | } else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) && | 4317 | } else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) && |
4340 | intel_panel_use_ssc(dev_priv) && num_connectors < 2) { | 4318 | intel_panel_use_ssc(dev_priv) && num_connectors < 2) { |
4341 | refclk = dev_priv->vbt.lvds_ssc_freq * 1000; | 4319 | refclk = dev_priv->vbt.lvds_ssc_freq * 1000; |