diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-10-16 13:52:31 -0400 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2014-10-27 07:37:13 -0400 |
| commit | 6be1e3d3ea29354d7c834a3936e796e185d5c73b (patch) | |
| tree | 498580a1b99a18edd58add897dc76bcfc153c320 /drivers/gpu | |
| parent | 7a7f84ccb82e542c845c43f604665ccea1247866 (diff) | |
drm/i915: Fix GMBUSFREQ on vlv/chv
vlv_cdclk_freq is in kHz but we need MHz for the GMBUSFREQ divider.
This is a regression from:
commit f8bf63fdcb1f82459dae7a3f22ee5ce92f3ea727
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Fri Jun 13 13:37:54 2014 +0300
drm/i915: Kill duplicated cdclk readout code from i2c
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c9e220963a78..07ff29589d37 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -4585,7 +4585,7 @@ static void vlv_update_cdclk(struct drm_device *dev) | |||
| 4585 | * BSpec erroneously claims we should aim for 4MHz, but | 4585 | * BSpec erroneously claims we should aim for 4MHz, but |
| 4586 | * in fact 1MHz is the correct frequency. | 4586 | * in fact 1MHz is the correct frequency. |
| 4587 | */ | 4587 | */ |
| 4588 | I915_WRITE(GMBUSFREQ_VLV, dev_priv->vlv_cdclk_freq); | 4588 | I915_WRITE(GMBUSFREQ_VLV, DIV_ROUND_UP(dev_priv->vlv_cdclk_freq, 1000)); |
| 4589 | } | 4589 | } |
| 4590 | 4590 | ||
| 4591 | /* Adjust CDclk dividers to allow high res or save power if possible */ | 4591 | /* Adjust CDclk dividers to allow high res or save power if possible */ |