[PATCH] HAX: Extra debug output for cdclk warning

Matt Roper matthew.d.roper at intel.com
Mon Oct 7 16:24:27 UTC 2019


Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 43564295b864..a26041bed837 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -718,13 +718,15 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv,
 	int cdclk = cdclk_state->cdclk;
 	u32 val;
 	int ret;
+	u32 lcpll_ctl = I915_READ(LCPLL_CTL);
 
-	if (WARN((I915_READ(LCPLL_CTL) &
+	if (WARN((lcpll_ctl &
 		  (LCPLL_PLL_DISABLE | LCPLL_PLL_LOCK |
 		   LCPLL_CD_CLOCK_DISABLE | LCPLL_ROOT_CD_CLOCK_DISABLE |
 		   LCPLL_CD2X_CLOCK_DISABLE | LCPLL_POWER_DOWN_ALLOW |
 		   LCPLL_CD_SOURCE_FCLK)) != LCPLL_PLL_LOCK,
-		 "trying to change cdclk frequency with cdclk not enabled\n"))
+		 "trying to change cdclk frequency on pipe %d with cdclk not enabled (LCPLL_CTL = 0x%x)\n",
+		 pipe, lcpll_ctl))
 		return;
 
 	ret = sandybridge_pcode_write(dev_priv,
-- 
2.21.0



More information about the Intel-gfx-trybot mailing list