Commit 7dbd03e2 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson

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: 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-5-michal.wajdeczko@intel.com
parent 4157a962
...@@ -170,7 +170,7 @@ void intel_wopcm_init(struct intel_wopcm *wopcm) ...@@ -170,7 +170,7 @@ void intel_wopcm_init(struct intel_wopcm *wopcm)
u32 guc_wopcm_rsvd; u32 guc_wopcm_rsvd;
int err; int err;
if (!USES_GUC(i915)) if (!guc_fw_size)
return; return;
GEM_BUG_ON(!wopcm->size); GEM_BUG_ON(!wopcm->size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment