drm/i915/display: Put glk_cdclk_table
diff mbox series

Message ID 20190911074727.32585-1-chris@chris-wilson.co.uk
State New
Headers show
Series
  • drm/i915/display: Put glk_cdclk_table
Related show

Commit Message

Chris Wilson Sept. 11, 2019, 7:47 a.m. UTC
Commit 736da8112fee ("drm/i915: Use literal representation of cdclk
tables") pushed the cdclk logic into tables, adding glk_cdclk_table but
not using yet:

drivers/gpu/drm/i915/display/intel_cdclk.c:1173:38: error: ‘glk_cdclk_table’ defined but not used [-Werror=unused-const-variable=]

Fixes: 736da8112fee ("drm/i915: Use literal representation of cdclk tables")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Ville Syrjälä Sept. 11, 2019, 10:36 a.m. UTC | #1
On Wed, Sep 11, 2019 at 08:47:27AM +0100, Chris Wilson wrote:
> Commit 736da8112fee ("drm/i915: Use literal representation of cdclk
> tables") pushed the cdclk logic into tables, adding glk_cdclk_table but
> not using yet:
> 
> drivers/gpu/drm/i915/display/intel_cdclk.c:1173:38: error: ‘glk_cdclk_table’ defined but not used [-Werror=unused-const-variable=]
> 
> Fixes: 736da8112fee ("drm/i915: Use literal representation of cdclk tables")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_cdclk.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index 618a93bad0a8..13779b6029f5 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -2511,7 +2511,10 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
>  		dev_priv->display.set_cdclk = bxt_set_cdclk;
>  		dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
>  		dev_priv->display.calc_voltage_level = bxt_calc_voltage_level;
> -		dev_priv->cdclk.table = bxt_cdclk_table;
> +		if (IS_GEMINILAKE(dev_priv))
> +			dev_priv->cdclk.table = glk_cdclk_table;
> +		else
> +			dev_priv->cdclk.table = bxt_cdclk_table;

Whoops.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

>  	} else if (IS_GEN9_BC(dev_priv)) {
>  		dev_priv->display.set_cdclk = skl_set_cdclk;
>  		dev_priv->display.modeset_calc_cdclk = skl_modeset_calc_cdclk;
> -- 
> 2.23.0
Chris Wilson Sept. 11, 2019, 12:50 p.m. UTC | #2
Quoting Ville Syrjälä (2019-09-11 11:36:53)
> On Wed, Sep 11, 2019 at 08:47:27AM +0100, Chris Wilson wrote:
> > Commit 736da8112fee ("drm/i915: Use literal representation of cdclk
> > tables") pushed the cdclk logic into tables, adding glk_cdclk_table but
> > not using yet:
> > 
> > drivers/gpu/drm/i915/display/intel_cdclk.c:1173:38: error: ‘glk_cdclk_table’ defined but not used [-Werror=unused-const-variable=]
> > 
> > Fixes: 736da8112fee ("drm/i915: Use literal representation of cdclk tables")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Matt Roper <matthew.d.roper@intel.com>
> > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_cdclk.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> > index 618a93bad0a8..13779b6029f5 100644
> > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> > @@ -2511,7 +2511,10 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
> >               dev_priv->display.set_cdclk = bxt_set_cdclk;
> >               dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
> >               dev_priv->display.calc_voltage_level = bxt_calc_voltage_level;
> > -             dev_priv->cdclk.table = bxt_cdclk_table;
> > +             if (IS_GEMINILAKE(dev_priv))
> > +                     dev_priv->cdclk.table = glk_cdclk_table;
> > +             else
> > +                     dev_priv->cdclk.table = bxt_cdclk_table;
> 
> Whoops.
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Pushed to silence the compiler. I'll let Matt check if this was all that
was truly required :)
-Chris

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 618a93bad0a8..13779b6029f5 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -2511,7 +2511,10 @@  void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
 		dev_priv->display.set_cdclk = bxt_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
 		dev_priv->display.calc_voltage_level = bxt_calc_voltage_level;
-		dev_priv->cdclk.table = bxt_cdclk_table;
+		if (IS_GEMINILAKE(dev_priv))
+			dev_priv->cdclk.table = glk_cdclk_table;
+		else
+			dev_priv->cdclk.table = bxt_cdclk_table;
 	} else if (IS_GEN9_BC(dev_priv)) {
 		dev_priv->display.set_cdclk = skl_set_cdclk;
 		dev_priv->display.modeset_calc_cdclk = skl_modeset_calc_cdclk;