[PATCH 3/8] drm/i915/guc: Don't touch WOPCM if we're not using GuC
Piotr Piórkowski
piotr.piorkowski at intel.com
Thu Apr 5 12:53:52 UTC 2018
From: Michał Winiarski <michal.winiarski at intel.com>
We probably shouldn't print out WOPCM size on platforms that don't have
GuC. We also want to make sure we don't hit any asserts if user explicitly
sets enable_guc != 0 on non-guc platforms.
Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Jackie Li <yaodong.li at intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Piotr Piorkowski <piotr.piorkowski at intel.com>
---
drivers/gpu/drm/i915/intel_wopcm.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c
index 39cca0c61b58..fb9f0ff4837f 100644
--- a/drivers/gpu/drm/i915/intel_wopcm.c
+++ b/drivers/gpu/drm/i915/intel_wopcm.c
@@ -71,6 +71,9 @@
*/
void intel_wopcm_init_early(struct intel_wopcm *wopcm)
{
+ if (!HAS_GUC(wopcm_to_i915(wopcm)))
+ return;
+
wopcm->size = GEN9_WOPCM_SIZE;
DRM_DEBUG_DRIVER("WOPCM size: %uKiB\n", wopcm->size / 1024);
@@ -163,6 +166,9 @@ int intel_wopcm_init(struct intel_wopcm *wopcm)
u32 guc_wopcm_rsvd;
int err;
+ if (!HAS_GUC(i915) || !USES_GUC(i915))
+ return 0;
+
GEM_BUG_ON(!wopcm->size);
guc_wopcm_base = ALIGN(huc_fw_size + WOPCM_RESERVED_SIZE,
@@ -230,10 +236,9 @@ int intel_wopcm_init_hw(struct intel_wopcm *wopcm)
u32 mask;
int err;
- if (!USES_GUC(dev_priv))
+ if (!HAS_GUC(dev_priv) || !USES_GUC(dev_priv))
return 0;
- GEM_BUG_ON(!HAS_GUC(dev_priv));
GEM_BUG_ON(!wopcm->guc.size);
GEM_BUG_ON(!wopcm->guc.base);
--
2.14.3
More information about the Intel-gfx-trybot
mailing list