Attachment 39349 Details for Bug 29821 – split mask & idle bits

[patch] split mask & idle bits

i915-edp-idle-check-fix.patch (text/plain), 1.32 KB, created by Jesse Barnes on 2010-10-11 12:24:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2010-10-11 12:24:48 UTC

Size: 1.32 KB

patch

obsolete

>commit 3302d985e1afbe68dbf447006ca8e0a5df626882
>Author: Jesse Barnes <jbarnes@virtuousgeek.org>
>Date:   Mon Oct 11 12:22:49 2010 -0700
>
>    drm/i915/dp: ignore ready bit when checking for panel idleness
>    
>    In some configs, the panel will be ready when we power it up, so ignore
>    the ready bit or we may indicate a timeout when none was necessary.
>    
>    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 8e019c8..f724d5b 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -790,7 +790,8 @@ static bool ironlake_edp_panel_on (struct intel_dp *intel_dp)
> {
> 	struct drm_device *dev = intel_dp->base.base.dev;
> 	struct drm_i915_private *dev_priv = dev->dev_private;
>-	u32 pp, idle_on_mask = PP_ON | PP_SEQUENCE_STATE_ON_IDLE;
>+	u32 pp, idle_on = PP_ON | PP_SEQUENCE_STATE_ON_IDLE;
>+	u32 idle_on_mask = PP_ON | PP_SEQUENCE_STATE_MASK;
> 
> 	if (I915_READ(PCH_PP_STATUS) & PP_ON)
> 		return true;
>@@ -811,7 +812,7 @@ static bool ironlake_edp_panel_on (struct intel_dp *intel_dp)
> 	 */
> 	msleep(300);
> 
>-	if (wait_for(I915_READ(PCH_PP_STATUS) == idle_on_mask,
>+	if (wait_for((I915_READ(PCH_PP_STATUS) & idle_on_mask) == idle_on,
> 		     5000))
> 		DRM_ERROR("panel on wait timed out: 0x%08x\n",
> 			  I915_READ(PCH_PP_STATUS));

Actions: View | Splinter Review

Attachments on bug 29821: 38183 | 38184 | 38185 | 38186 | 38187 | 38188 | 38189 | 38190 | 38191 | 38192 | 38369 | 39349

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.