| From 6be1e3d3ea29354d7c834a3936e796e185d5c73b Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Thu, 16 Oct 2014 20:52:31 +0300 |
| Subject: drm/i915: Fix GMBUSFREQ on vlv/chv |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| |
| commit 6be1e3d3ea29354d7c834a3936e796e185d5c73b upstream. |
| |
| 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> |
| Signed-off-by: Jani Nikula <jani.nikula@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -4470,7 +4470,7 @@ static void vlv_update_cdclk(struct drm_ |
| * BSpec erroneously claims we should aim for 4MHz, but |
| * in fact 1MHz is the correct frequency. |
| */ |
| - I915_WRITE(GMBUSFREQ_VLV, dev_priv->vlv_cdclk_freq); |
| + I915_WRITE(GMBUSFREQ_VLV, DIV_ROUND_UP(dev_priv->vlv_cdclk_freq, 1000)); |
| } |
| |
| /* Adjust CDclk dividers to allow high res or save power if possible */ |
