From 4a631f5735023990d8fcad5f5191b998577ff852 Mon Sep 17 00:00:00 2001 From: Michal Wajdeczko Date: Wed, 7 Aug 2019 17:00:31 +0000 Subject: [PATCH] drm/i915: Don't try to partition WOPCM without GuC firmware For meaningful WOPCM partitioning we need GuC (and optionally HuC) firmware size(s) and we shouldn't just rely on GuC support flag, as we might fail to fetch GuC firmware and it's size will be 0 and all calculations will be just wrong/useless. Signed-off-by: Michal Wajdeczko Cc: Daniele Ceraolo Spurio Cc: Chris Wilson Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20190807170034.8440-5-michal.wajdeczko@intel.com --- drivers/gpu/drm/i915/intel_wopcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c index 4c22143ee84fa..5e5c3fd3472d5 100644 --- a/drivers/gpu/drm/i915/intel_wopcm.c +++ b/drivers/gpu/drm/i915/intel_wopcm.c @@ -170,7 +170,7 @@ void intel_wopcm_init(struct intel_wopcm *wopcm) u32 guc_wopcm_rsvd; int err; - if (!USES_GUC(i915)) + if (!guc_fw_size) return; GEM_BUG_ON(!wopcm->size); -- 2.39.5