[Intel-gfx] [PATCH 5/5] drm/i915: Improve PCBR debug information

[Daniel Vetter]

On Tue, Nov 18, 2014 at 02:48:27PM +0530, Deepak S wrote:
> 
> On Saturday 08 November 2014 01:03 AM, ville.syrjala at linux.intel.com wrote:
> >From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> >
> >Always print the final PCBR register value on both vlv and chv, and
> >also tell us whether the BIOS was a good citizen or not.
> >
> >Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> >---
> >  drivers/gpu/drm/i915/intel_pm.c | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> >
> >diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> >index e8a6f92..ef8e055 100644
> >--- a/drivers/gpu/drm/i915/intel_pm.c
> >+++ b/drivers/gpu/drm/i915/intel_pm.c
> >@@ -5126,12 +5126,15 @@ static void cherryview_setup_pctx(struct drm_device *dev)
> >  	pcbr = I915_READ(VLV_PCBR);
> >  	if ((pcbr >> VLV_PCBR_ADDR_SHIFT) == 0) {
> >+		DRM_DEBUG_DRIVER("BIOS didn't set up PCBR, fixing up\n");
> >  		paddr = (dev_priv->mm.stolen_base +
> >  			 (gtt->stolen_size - pctx_size));
> >  		pctx_paddr = (paddr & (~4095));
> >  		I915_WRITE(VLV_PCBR, pctx_paddr);
> >  	}
> >+
> >+	DRM_DEBUG_DRIVER("PCBR: 0x%08x\n", I915_READ(VLV_PCBR));
> >  }
> >  static void valleyview_setup_pctx(struct drm_device *dev)
> >@@ -5157,6 +5160,8 @@ static void valleyview_setup_pctx(struct drm_device *dev)
> >  		goto out;
> >  	}
> >+	DRM_DEBUG_DRIVER("BIOS didn't set up PCBR, fixing up\n");
> >+
> >  	/*
> >  	 * From the Gunit register HAS:
> >  	 * The Gfx driver is expected to program this register and ensure
> >@@ -5175,6 +5180,7 @@ static void valleyview_setup_pctx(struct drm_device *dev)
> >  	I915_WRITE(VLV_PCBR, pctx_paddr);
> >  out:
> >+	DRM_DEBUG_DRIVER("PCBR: 0x%08x\n", I915_READ(VLV_PCBR));
> >  	dev_priv->vlv_pctx = pctx;
> >  }
> >@@ -5366,8 +5372,6 @@ static void cherryview_enable_rps(struct drm_device *dev)
> >  	/* For now we assume BIOS is allocating and populating the PCBR  */
> >  	pcbr = I915_READ(VLV_PCBR);
> >-	DRM_DEBUG_DRIVER("PCBR offset : 0x%x\n", pcbr);
> >-
> >  	/* 3: Enable RC6 */
> >  	if ((intel_enable_rc6(dev) & INTEL_RC6_ENABLE) &&
> >  						(pcbr >> VLV_PCBR_ADDR_SHIFT))
> 
> Reviewed-by: Deepak S <deepak.s at linux.intel.com>

Thanks for the patches&review, all merged to dinq now.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch