drm/i915/uc: WOPCM programming errors are not always real

WOPCM programming error might be due to inserted earlier probe
failure that could affects HuC firmware loading and thus impacts
result of WOPCM partitioning that would be now incompatible with
previously programmed values.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190807170034.8440-7-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index c40eab29034287724df3a362d926357004cb8c00..32aa4509ba1d1de0587470fc8f9966898837a177 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -415,11 +415,13 @@ static int uc_init_wopcm(struct intel_uc *uc)
        return 0;
 
 err_out:
-       DRM_ERROR("Failed to init uC WOPCM registers:\n");
-       DRM_ERROR("DMA_GUC_WOPCM_OFFSET=%#x\n",
-                 intel_uncore_read(uncore, DMA_GUC_WOPCM_OFFSET));
-       DRM_ERROR("GUC_WOPCM_SIZE=%#x\n",
-                 intel_uncore_read(uncore, GUC_WOPCM_SIZE));
+       i915_probe_error(gt->i915, "Failed to init uC WOPCM registers!\n");
+       i915_probe_error(gt->i915, "%s(%#x)=%#x\n", "DMA_GUC_WOPCM_OFFSET",
+                        i915_mmio_reg_offset(DMA_GUC_WOPCM_OFFSET),
+                        intel_uncore_read(uncore, DMA_GUC_WOPCM_OFFSET));
+       i915_probe_error(gt->i915, "%s(%#x)=%#x\n", "GUC_WOPCM_SIZE",
+                        i915_mmio_reg_offset(GUC_WOPCM_SIZE),
+                        intel_uncore_read(uncore, GUC_WOPCM_SIZE));
 
        return err;
 }