On Mon, 30 Nov 2015, [email protected] wrote: > From: Ville Syrjälä <[email protected]> > > Somehow we accumulated a duplicated .get_display_clock_speed() > assignment for PNV in > commit 34edce2fea69 ("drm/i915: Add cdclk extraction for g33, g965gm and g4x") > > No real harm on having two, we just never reach the second one, so > simply kill it. > > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/i915/intel_display.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index 8dbe5b398af4..84395c8c9dce 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -14791,9 +14791,6 @@ static void intel_init_display(struct drm_device *dev) > else if (IS_I945GM(dev) || IS_845G(dev)) > dev_priv->display.get_display_clock_speed = > i9xx_misc_get_display_clock_speed; > - else if (IS_PINEVIEW(dev)) > - dev_priv->display.get_display_clock_speed = > - pnv_get_display_clock_speed; > else if (IS_I915GM(dev)) > dev_priv->display.get_display_clock_speed = > i915gm_get_display_clock_speed; -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
