| Message ID | 1478791400-21756-14-git-send-email-ander.conselvan.de.oliveira@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> On Thu, Nov 10, 2016 at 05:23:18PM +0200, Ander Conselvan de Oliveira wrote: > Geminilake has double wide pipes so it can output two pixels per CD > clock. > > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 62cc390..7763c44 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -5830,8 +5830,10 @@ static int intel_compute_max_dotclk(struct drm_i915_private *dev_priv) > { > int max_cdclk_freq = dev_priv->max_cdclk_freq; > > - if (INTEL_INFO(dev_priv)->gen >= 9 || > - IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > + if (IS_GEMINILAKE(dev_priv)) > + return 2 * max_cdclk_freq; > + else if (INTEL_INFO(dev_priv)->gen >= 9 || > + IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > return max_cdclk_freq; > else if (IS_CHERRYVIEW(dev_priv)) > return max_cdclk_freq*95/100; > @@ -6588,9 +6590,9 @@ static int valleyview_calc_cdclk(struct drm_i915_private *dev_priv, > > static int glk_calc_cdclk(int max_pixclk) > { > - if (max_pixclk > 158400) > + if (max_pixclk > 2 * 158400) > return 316800; > - else if (max_pixclk > 79200) > + else if (max_pixclk > 2 * 79200) > return 158400; > else > return 79200; > -- > 2.5.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 62cc390..7763c44 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5830,8 +5830,10 @@ static int intel_compute_max_dotclk(struct drm_i915_private *dev_priv) { int max_cdclk_freq = dev_priv->max_cdclk_freq; - if (INTEL_INFO(dev_priv)->gen >= 9 || - IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) + if (IS_GEMINILAKE(dev_priv)) + return 2 * max_cdclk_freq; + else if (INTEL_INFO(dev_priv)->gen >= 9 || + IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) return max_cdclk_freq; else if (IS_CHERRYVIEW(dev_priv)) return max_cdclk_freq*95/100; @@ -6588,9 +6590,9 @@ static int valleyview_calc_cdclk(struct drm_i915_private *dev_priv, static int glk_calc_cdclk(int max_pixclk) { - if (max_pixclk > 158400) + if (max_pixclk > 2 * 158400) return 316800; - else if (max_pixclk > 79200) + else if (max_pixclk > 2 * 79200) return 158400; else return 79200;
Geminilake has double wide pipes so it can output two pixels per CD clock. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)