[Intel-gfx] [PATCH 07/14] drm/i915: Unify ilk and hsw .get_aux_clock_divider

[Mika Kahola]

ilk_get_aux_clock_divider() is now a subset of
hsw_get_aux_clock_divider() so unify them.

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Signed-off-by: Mika Kahola <mika.kah...@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 91ccdaa..b415d3e 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -698,23 +698,6 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp 
*intel_dp, int index)
        struct drm_device *dev = intel_dig_port->base.base.dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
 
-       if (index)
-               return 0;
-
-       if (intel_dig_port->port == PORT_A) {
-               return DIV_ROUND_UP(dev_priv->cdclk_freq, 2000);
-
-       } else {
-               return DIV_ROUND_UP(intel_pch_rawclk(dev), 2);
-       }
-}
-
-static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index)
-{
-       struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-       struct drm_device *dev = intel_dig_port->base.base.dev;
-       struct drm_i915_private *dev_priv = dev->dev_private;
-
        if (intel_dig_port->port == PORT_A) {
                if (index)
                        return 0;
@@ -727,7 +710,9 @@ static uint32_t hsw_get_aux_clock_divider(struct intel_dp 
*intel_dp, int index)
                default: return 0;
                }
        } else  {
-               return index ? 0 : DIV_ROUND_UP(intel_pch_rawclk(dev), 2);
+               if (index)
+                       return 0;
+               return DIV_ROUND_UP(intel_pch_rawclk(dev), 2);
        }
 }
 
@@ -5474,8 +5459,6 @@ intel_dp_init_connector(struct intel_digital_port 
*intel_dig_port,
                intel_dp->get_aux_clock_divider = skl_get_aux_clock_divider;
        else if (IS_VALLEYVIEW(dev))
                intel_dp->get_aux_clock_divider = vlv_get_aux_clock_divider;
-       else if (IS_HASWELL(dev) || IS_BROADWELL(dev))
-               intel_dp->get_aux_clock_divider = hsw_get_aux_clock_divider;
        else if (HAS_PCH_SPLIT(dev))
                intel_dp->get_aux_clock_divider = ilk_get_aux_clock_divider;
        else
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx