[PATCH 02/10] drm/i915/guc: Don't init WOPCM on platforms without GuC
Michał Winiarski
michal.winiarski at intel.com
Tue Jul 17 16:41:19 UTC 2018
We're currently printing out "WOPCM size: XXXXKiB" and "Calculated GuC
WOPCM Region: [XXKiB, XXXXKiB)" messages on platforms that don't even
have GuC. Let's avoid doing that.
Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
---
drivers/gpu/drm/i915/intel_wopcm.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c
index 74bf76f3fddc..eded9446ac2e 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(wopcm_to_i915(wopcm)))
+ return 0;
+
GEM_BUG_ON(!wopcm->size);
if (guc_fw_size >= wopcm->size) {
--
2.17.1
More information about the Intel-gfx-trybot
mailing list