drm/i915/icl: Add new supported CD clocks

Now 180, 172.8 and 192 MHz are supported.

180 and 172.8 MHz CD clocks will only be used when audio is not
enabled as state by BSpec and implemented in
intel_crtc_compute_min_cdclk(), CD clock must be at least twice of
Azalia BCLK and BCLK by default is 96 MHz, it could be set to 48 MHz
but we are not reading it.

v3:
- making icl clock arrays static (Ville)

BSpec: 20598
BSpec: 15729
Cc: Clint Taylor <Clinton.A.Taylor@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190626014053.30541-1-jose.souza@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 8993ab283562b2dc8fa65ec54ad5a0c05353c010..c8ebd31f7c24b8a1bfb5a09457a25b5934aea987 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -1756,9 +1756,10 @@ sanitize:
 
 static int icl_calc_cdclk(int min_cdclk, unsigned int ref)
 {
-       int ranges_24[] = { 312000, 552000, 648000 };
-       int ranges_19_38[] = { 307200, 556800, 652800 };
-       int *ranges;
+       static const int ranges_24[] = { 180000, 192000, 312000, 552000, 648000 };
+       static const int ranges_19_38[] = { 172800, 192000, 307200, 556800, 652800 };
+       const int *ranges;
+       int len, i;
 
        switch (ref) {
        default:
@@ -1766,19 +1767,22 @@ static int icl_calc_cdclk(int min_cdclk, unsigned int ref)
                /* fall through */
        case 24000:
                ranges = ranges_24;
+               len = ARRAY_SIZE(ranges_24);
                break;
        case 19200:
        case 38400:
                ranges = ranges_19_38;
+               len = ARRAY_SIZE(ranges_19_38);
                break;
        }
 
-       if (min_cdclk > ranges[1])
-               return ranges[2];
-       else if (min_cdclk > ranges[0])
-               return ranges[1];
-       else
-               return ranges[0];
+       for (i = 0; i < len; i++) {
+               if (min_cdclk <= ranges[i])
+                       return ranges[i];
+       }
+
+       WARN_ON(min_cdclk > ranges[len - 1]);
+       return ranges[len - 1];
 }
 
 static int icl_calc_cdclk_pll_vco(struct drm_i915_private *dev_priv, int cdclk)
@@ -1792,16 +1796,24 @@ static int icl_calc_cdclk_pll_vco(struct drm_i915_private *dev_priv, int cdclk)
        default:
                MISSING_CASE(cdclk);
                /* fall through */
+       case 172800:
        case 307200:
        case 556800:
        case 652800:
                WARN_ON(dev_priv->cdclk.hw.ref != 19200 &&
                        dev_priv->cdclk.hw.ref != 38400);
                break;
+       case 180000:
        case 312000:
        case 552000:
        case 648000:
                WARN_ON(dev_priv->cdclk.hw.ref != 24000);
+               break;
+       case 192000:
+               WARN_ON(dev_priv->cdclk.hw.ref != 19200 &&
+                       dev_priv->cdclk.hw.ref != 38400 &&
+                       dev_priv->cdclk.hw.ref != 24000);
+               break;
        }
 
        ratio = cdclk / (dev_priv->cdclk.hw.ref / 2);