drm/i915: fix HDMI clock readout on Haswell
Subsystems (2)
PATCH 1/1 drm/i915: fix HDMI clock readout on Haswell
From: Paulo Zanoni <[email protected]>
This stops the WARNs when booting with an HDMI monitor connected.
Signed-off-by Paulo Zanoni <[email protected]>
--- drivers/gpu/drm/i915/intel_ddi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ddi.c +1 -1
@@ -663,7 +663,7 @@ static int intel_ddi_calc_wrpll_link(struct drm_i915_private *dev_priv, p = (wrpll &WRPLL_DIVIDER_POST_MASK ) >>WRPLL_DIVIDER_POST_SHIFT ; n = (wrpll &WRPLL_DIVIDER_FB_MASK ) >>WRPLL_DIVIDER_FB_SHIFT ; -return (LC_FREQ * n) / (p * r); +return ((LC_FREQ * n) *100 ) / (p * r); } static void intel_ddi_clock_get(struct intel_encoder *encoder,
Signature · 1 line
1.8.4.2
Quoted 14 lines · On Wed, 22 Jan 2014 18:39:26 -0200 Paulo Zanoni <[email protected]> wrote:
From: Paulo Zanoni <[email protected]>
This stops the WARNs when booting with an HDMI monitor connected.
Signed-off-by Paulo Zanoni <[email protected]>--- drivers/gpu/drm/i915/intel_ddi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_ddi.c +0
-0
drivers/gpu/drm/i915/intel_ddi.c static int intel_ddi_calc_wrpll_link(struct drm_i915_private *dev_priv, · line 669
Quoted 8 lines
drivers/gpu/drm/i915/intel_ddi.c +1
-1@@ -663,7 +663,7 @@ static int intel_ddi_calc_wrpll_link(struct drm_i915_private *dev_priv, p = (wrpll &WRPLL_DIVIDER_POST_MASK ) >>WRPLL_DIVIDER_POST_SHIFT ; n = (wrpll &WRPLL_DIVIDER_FB_MASK ) >>WRPLL_DIVIDER_FB_SHIFT ; -return (LC_FREQ * n) / (p * r); +return ((LC_FREQ * n) *100 ) / (p * r); } static void intel_ddi_clock_get(struct intel_encoder *encoder,
Yep, looks like units fail. And I failed to replace LC_FREQ with refclk when I added the WRPLL refclk fetching... I'll post an updated patch with both fixed.
Thanks,
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center