Commit a0752c87 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

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: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190807170034.8440-7-michal.wajdeczko@intel.com
parent d4b2cfb8

drivers/gpu/drm/i915/gt/uc/intel_uc.c

+7 −5
Original line number Diff line number Diff line
@@ -415,10 +415,12 @@ 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",

	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));

	DRM_ERROR("GUC_WOPCM_SIZE=%#x\n",

	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;