Message ID | 1461689194-6079-3-git-send-email-ville.syrjala@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Looks reasonable. Reviewed-by: Mika Kahola <mika.kahola@intel.com> On Tue, 2016-04-26 at 19:46 +0300, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > No point in reading the cdclk out from the hardware every single time > since we have it cached already. Just return the cached value to the > audio driver. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_audio.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c > index 56ba8765816e..1063108a9bab 100644 > --- a/drivers/gpu/drm/i915/intel_audio.c > +++ b/drivers/gpu/drm/i915/intel_audio.c > @@ -624,17 +624,11 @@ static void i915_audio_component_codec_wake_override(struct device *dev, > static int i915_audio_component_get_cdclk_freq(struct device *dev) > { > struct drm_i915_private *dev_priv = dev_to_i915(dev); > - int ret; > > if (WARN_ON_ONCE(!HAS_DDI(dev_priv))) > return -ENODEV; > > - intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO); > - ret = dev_priv->display.get_display_clock_speed(dev_priv->dev); > - > - intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO); > - > - return ret; > + return dev_priv->cdclk_freq; > } > > static int i915_audio_component_sync_audio_rate(struct device *dev,
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 56ba8765816e..1063108a9bab 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -624,17 +624,11 @@ static void i915_audio_component_codec_wake_override(struct device *dev, static int i915_audio_component_get_cdclk_freq(struct device *dev) { struct drm_i915_private *dev_priv = dev_to_i915(dev); - int ret; if (WARN_ON_ONCE(!HAS_DDI(dev_priv))) return -ENODEV; - intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO); - ret = dev_priv->display.get_display_clock_speed(dev_priv->dev); - - intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO); - - return ret; + return dev_priv->cdclk_freq; } static int i915_audio_component_sync_audio_rate(struct device *dev,