drm/i915/i9xx: check for panel on pipe before asserting panel unlock bits
Subsystems (2)
PATCH 1/1 drm/i915/i9xx: check for panel on pipe before asserting panel unlock bits
Should address a warning reported in #79824.
References: https://bugs.freedesktop.org/show_bug.cgi?id=79824
--- drivers/gpu/drm/i915/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +3 -1
@@ -1607,7 +1607,9 @@ static void i9xx_enable_pll(struct intel_crtc *crtc)BUG_ON (INTEL_INFO (dev)->gen >=5 );/* PLL is protected by panel, make sure we can write it */ -if (IS_MOBILE (dev) && !IS_I830 (dev)) +if (IS_MOBILE (dev) && !IS_I830 (dev) && + (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ) || +intel_pipe_has_type (crtc,INTEL_OUTPUT_EDP )))assert_panel_unlocked (dev_priv, crtc->pipe);/* Enable DVO 2x clock on both PLLs if necessary */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 364/364 364/364
ILK +1-4 364/366 361/366
SNB 448/450 448/450 IVB 497/498 497/498 BYT 289/289 289/289 HSW 563/564 563/564 BDW 417/417 417/417 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *ILK igt_kms_pipe_crc_basic_bad-pipe PASS(2, M26) DMESG_WARN(1, M26) *ILK igt_kms_flip_busy-flip-interruptible PASS(5, M26) DMESG_WARN(1, M26) *ILK igt_kms_flip_flip-vs-rmfb-interruptible NSPT(1, M26)PASS(5, M26) DMESG_WARN(1, M26) ILK igt_kms_flip_plain-flip-ts-check-interruptible DMESG_WARN(1, M26)PASS(4, M26) DMESG_WARN(1, M26) ILK igt_kms_flip_wf_vblank-ts-check DMESG_WARN(7, M26)PASS(21, M26M37) PASS(1, M26)
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 17 lines · On 11 Dec 2014 00:40:28 -0800 [email protected] wrote:
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 364/364 364/364
ILK +1-4 364/366 361/366SNB 448/450 448/450 IVB 497/498 497/498 BYT 289/289 289/289 HSW 563/564 563/564 BDW 417/417 417/417 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *ILK igt_kms_pipe_crc_basic_bad-pipe PASS(2, M26) DMESG_WARN(1, M26) *ILK igt_kms_flip_busy-flip-interruptible PASS(5, M26) DMESG_WARN(1, M26) *ILK igt_kms_flip_flip-vs-rmfb-interruptible NSPT(1, M26)PASS(5, M26) DMESG_WARN(1, M26) ILK igt_kms_flip_plain-flip-ts-check-interruptible DMESG_WARN(1, M26)PASS(4, M26) DMESG_WARN(1, M26) ILK igt_kms_flip_wf_vblank-ts-check DMESG_WARN(7, M26)PASS(21, M26M37) PASS(1, M26)
Quoted 1 line
Note: You need to pay more attention to line start with '*'
Based on this log and the one for saving and restoring the GMbus clock, it looks like we have some inconsistent results on ILK. Can you look into the logs and file bugs against those tests if they're no already filed?
Thanks,
Signature · 5 lines
Jesse Barnes, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Jesse Barnes
Should address a warning reported in #79824.
References: https://bugs.freedesktop.org/show_bug.cgi?id=79824
Signed-off-by Jesse Barnes <[email protected]>
Isn's this fixed by https://freedesktop.org/patch/37900/ ?
Quoted 26 lines
--- drivers/gpu/drm/i915/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +3
-1@@ -1607,7 +1607,9 @@ static void i9xx_enable_pll(struct intel_crtc *crtc)BUG_ON (INTEL_INFO (dev)->gen >=5 );/* PLL is protected by panel, make sure we can write it */ -if (IS_MOBILE (dev) && !IS_I830 (dev)) +if (IS_MOBILE (dev) && !IS_I830 (dev) && + (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ) || +intel_pipe_has_type (crtc,INTEL_OUTPUT_EDP )))assert_panel_unlocked (dev_priv, crtc->pipe);/* Enable DVO 2x clock on both PLLs if necessary */ Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Ville Syrjälä
Quoted 4 lines · Jesse Barnes
Should address a warning reported in #79824.
References: https://bugs.freedesktop.org/show_bug.cgi?id=79824
Signed-off-by Jesse Barnes <[email protected]>Isn's this fixed by https://freedesktop.org/patch/37900/ ?
Yeah, I've updated the bug with the commit citation. If it doesn't work we can revisit Jesse's patch here.
-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
Jani Nikula
maintainerQuoted 7 lines · Ville Syrjälä
Quoted 4 lines · Jesse Barnes
Should address a warning reported in #79824.
References: https://bugs.freedesktop.org/show_bug.cgi?id=79824
Signed-off-by Jesse Barnes <[email protected]>Isn's this fixed by https://freedesktop.org/patch/37900/ ?
Off-topic, does that link really work for you?
Jani.
Quoted 35 lines
Quoted 27 lines
--- drivers/gpu/drm/i915/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +3
-1@@ -1607,7 +1607,9 @@ static void i9xx_enable_pll(struct intel_crtc *crtc)BUG_ON (INTEL_INFO (dev)->gen >=5 );/* PLL is protected by panel, make sure we can write it */ -if (IS_MOBILE (dev) && !IS_I830 (dev)) +if (IS_MOBILE (dev) && !IS_I830 (dev) && + (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ) || +intel_pipe_has_type (crtc,INTEL_OUTPUT_EDP )))assert_panel_unlocked (dev_priv, crtc->pipe);/* Enable DVO 2x clock on both PLLs if necessary */ Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Jani Nikula
Quoted 7 lines · Ville Syrjälä
Quoted 4 lines · Jesse Barnes
Should address a warning reported in #79824.
References: https://bugs.freedesktop.org/show_bug.cgi?id=79824
Signed-off-by Jesse Barnes <[email protected]>Isn's this fixed by https://freedesktop.org/patch/37900/ ?
Off-topic, does that link really work for you?
Yes
Quoted 43 lines
Jani.
Quoted 35 lines
Quoted 27 lines
--- drivers/gpu/drm/i915/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +3
-1@@ -1607,7 +1607,9 @@ static void i9xx_enable_pll(struct intel_crtc *crtc)BUG_ON (INTEL_INFO (dev)->gen >=5 );/* PLL is protected by panel, make sure we can write it */ -if (IS_MOBILE (dev) && !IS_I830 (dev)) +if (IS_MOBILE (dev) && !IS_I830 (dev) && + (intel_pipe_has_type (crtc,INTEL_OUTPUT_LVDS ) || +intel_pipe_has_type (crtc,INTEL_OUTPUT_EDP )))assert_panel_unlocked (dev_priv, crtc->pipe);/* Enable DVO 2x clock on both PLLs if necessary */ Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx