drm/i915: Read CHV_PLL_DW8 from the correct offset
Subsystems (2)
PATCH 1/1 drm/i915: Read CHV_PLL_DW8 from the correct offset
From: Ville Syrjälä <[email protected]>
We accidentally pass 'pipe' instead of 'port' to CHV_PLL_DW8() and with PIPE_C we end up at register offset 0x8320 which isn't the 0x8020 we wanted. Fix it.
The problem was fortunately caught by the sanity check in vlv_dpio_read():
WARNING: CPU: 1 PID: 238 at ../drivers/gpu/drm/i915/intel_sideband.c:200 vlv_dpio_read+0x77/0x80 [i915]()
DPIO read pipe C reg 0x8320 == 0xffffffff
The problem got introduced with this commit:
commit 71af07f91f12bbab96335e202c82525d31680960
Author: Vijay Purushothaman <[email protected]>
Date: Thu Mar 5 19:33:08 2015 +0530
drm/i915: Update prop, int co-eff and gain threshold for CHV
--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -6270,7 +6270,7 @@ static void chv_prepare_pll(struct intel_crtc *crtc, }vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW6 (port), loopfilter); - dpio_val =vlv_dpio_read (dev_priv, pipe,CHV_PLL_DW8 (pipe)); + dpio_val =vlv_dpio_read (dev_priv, pipe,CHV_PLL_DW8 (port)); dpio_val &= ~DPIO_CHV_TDC_TARGET_CNT_MASK ; dpio_val |= (tribuf_calcntr <<DPIO_CHV_TDC_TARGET_CNT_SHIFT );vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW8 (port), dpio_val);
Signature · 6 lines
2.0.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 5936 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -15 281/281 266/281 ILK -1 308/308 307/308 SNB -1 284/284 283/284 IVB 375/375 375/375 BYT 294/294 294/294
HSW -1 384/384 383/384
BDW 315/315 315/315
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*PNV igt_gem_fence_thrash_bo-write-verify-none PASS(3) FAIL(1) *PNV igt_gem_fence_thrash_bo-write-verify-x PASS(3) FAIL(1) *PNV igt_gem_fence_thrash_bo-write-verify-y PASS(3) FAIL(1) PNV igt_gem_userptr_blits_coherency-sync CRASH(5)PASS(2) CRASH(1) PNV igt_gen3_render_linear_blits FAIL(3)PASS(1) FAIL(1) PNV igt_gen3_render_mixed_blits FAIL(2)PASS(2) FAIL(1) PNV igt_gen3_render_tiledx_blits FAIL(4)PASS(1) FAIL(1) PNV igt_gem_fence_thrash_bo-write-verify-threaded-none CRASH(2)PASS(4) CRASH(1) *PNV igt_gem_partial_pwrite_pread_reads PASS(2) NRUN(1) *PNV igt_gem_partial_pwrite_pread_reads-display PASS(2) NRUN(1) *PNV igt_gem_pwrite_pread_display-pwrite-blt-gtt_mmap-performance PASS(2) NRUN(1) *PNV igt_gem_ringfill_blitter PASS(2) NRUN(1) *PNV igt_gem_ringfill_blitter-interruptible PASS(2) NRUN(1) *PNV igt_gem_tiled_pread_pwrite FAIL(1)PASS(2) NRUN(1) *PNV igt_gem_userptr_blits_forked-sync-mempressure-interruptible PASS(2) NRUN(1) *ILK igt_gem_unfence_active_buffers PASS(3) DMESG_WARN(1)PASS(1) *SNB igt_gem_flink_bad-open PASS(2) DMESG_WARN(1)PASS(1) *HSW igt_pm_rpm_reg-read-ioctl PASS(2) DMESG_FAIL(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 28 lines · On 3/11/2015 1:52 PM, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
We accidentally pass 'pipe' instead of 'port' to
CHV_PLL_DW8()and withPIPE_Cwe end up at register offset0x8320which isn't the0x8020we wanted. Fix it.The problem was fortunately caught by the sanity check in
vlv_dpio_read():WARNING: CPU: 1 PID: 238 at ../drivers/gpu/drm/i915/intel_sideband.c:200 vlv_dpio_read+0x77/0x80 [i915]()DPIO read pipe C reg
0x8320==0xffffffffThe problem got introduced with this commit:
commit71af07f91f12bbab96335e202c82525d31680960
Author: Vijay Purushothaman <[email protected]>
Date: Thu Mar 5 19:33:08 2015 +0530drm/i915: Update prop, int co-eff and gain threshold for CHV
Cc Vijay Purushothaman <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static void chv_prepare_pll(struct intel_crtc *crtc, · line 6276
Quoted 8 lines
drivers/gpu/drm/i915/intel_display.c +1
-1@@ -6270,7 +6270,7 @@ static void chv_prepare_pll(struct intel_crtc *crtc, }vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW6 (port), loopfilter); - dpio_val =vlv_dpio_read (dev_priv, pipe,CHV_PLL_DW8 (pipe)); + dpio_val =vlv_dpio_read (dev_priv, pipe,CHV_PLL_DW8 (port)); dpio_val &= ~DPIO_CHV_TDC_TARGET_CNT_MASK ; dpio_val |= (tribuf_calcntr <<DPIO_CHV_TDC_TARGET_CNT_SHIFT );vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW8 (port), dpio_val);
Looks good to me.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 39 lines · Todd Previte
Quoted 28 lines · On 3/11/2015 1:52 PM, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
We accidentally pass 'pipe' instead of 'port' to
CHV_PLL_DW8()and withPIPE_Cwe end up at register offset0x8320which isn't the0x8020we wanted. Fix it.The problem was fortunately caught by the sanity check in
vlv_dpio_read():WARNING: CPU: 1 PID: 238 at ../drivers/gpu/drm/i915/intel_sideband.c:200 vlv_dpio_read+0x77/0x80 [i915]()DPIO read pipe C reg
0x8320==0xffffffffThe problem got introduced with this commit:
commit71af07f91f12bbab96335e202c82525d31680960
Author: Vijay Purushothaman <[email protected]>
Date: Thu Mar 5 19:33:08 2015 +0530drm/i915: Update prop, int co-eff and gain threshold for CHV
Cc Vijay Purushothaman <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +0
-0drivers/gpu/drm/i915/intel_display.c static void chv_prepare_pll(struct intel_crtc *crtc, · line 6275
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +1
-1@@ -6270,7 +6270,7 @@ static void chv_prepare_pll(struct intel_crtc *crtc, }vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW6 (port), loopfilter); - dpio_val =vlv_dpio_read (dev_priv, pipe,CHV_PLL_DW8 (pipe)); + dpio_val =vlv_dpio_read (dev_priv, pipe,CHV_PLL_DW8 (port)); dpio_val &= ~DPIO_CHV_TDC_TARGET_CNT_MASK ; dpio_val |= (tribuf_calcntr <<DPIO_CHV_TDC_TARGET_CNT_SHIFT );vlv_dpio_write (dev_priv, pipe,CHV_PLL_DW8 (port), dpio_val);Looks good to me.
Quoted 1 line
Reviewed-by Todd Previte <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx