| From fc6b0a504a857060d0d10195cfdf492a5343b974 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Tue, 24 Sep 2013 21:26:30 +0300 |
| Subject: drm/i915: intel_limits_vlv_dac and intel_limits_vlv_hdmi are the same |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| After aligning the p1 divider limits, and removing the unused p and m |
| limits, intel_limits_vlv_dac and intel_limits_vlv_hdmi are identical. |
| |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit dc730512be540c7e438f1411e11662edbd8638ae) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 17 ++--------------- |
| 1 file changed, 2 insertions(+), 15 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index 0a993962fd44..ed05713b54b7 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -309,17 +309,7 @@ static const intel_limit_t intel_limits_ironlake_dual_lvds_100m = { |
| .p2_slow = 7, .p2_fast = 7 }, |
| }; |
| |
| -static const intel_limit_t intel_limits_vlv_dac = { |
| - .dot = { .min = 25000, .max = 270000 }, |
| - .vco = { .min = 4000000, .max = 6000000 }, |
| - .n = { .min = 1, .max = 7 }, |
| - .m1 = { .min = 2, .max = 3 }, |
| - .m2 = { .min = 11, .max = 156 }, |
| - .p1 = { .min = 2, .max = 3 }, |
| - .p2 = { .p2_slow = 2, .p2_fast = 20 }, /* slow=min, fast=max */ |
| -}; |
| - |
| -static const intel_limit_t intel_limits_vlv_hdmi = { |
| +static const intel_limit_t intel_limits_vlv = { |
| .dot = { .min = 25000, .max = 270000 }, |
| .vco = { .min = 4000000, .max = 6000000 }, |
| .n = { .min = 1, .max = 7 }, |
| @@ -412,10 +402,7 @@ static const intel_limit_t *intel_limit(struct drm_crtc *crtc, int refclk) |
| else |
| limit = &intel_limits_pineview_sdvo; |
| } else if (IS_VALLEYVIEW(dev)) { |
| - if (intel_pipe_has_type(crtc, INTEL_OUTPUT_ANALOG)) |
| - limit = &intel_limits_vlv_dac; |
| - else |
| - limit = &intel_limits_vlv_hdmi; |
| + limit = &intel_limits_vlv; |
| } else if (!IS_GEN2(dev)) { |
| if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) |
| limit = &intel_limits_i9xx_lvds; |
| -- |
| 1.8.5.rc3 |
| |
