drm/i915/guc: Do not partition WOPCM if GuC is not used
authorJakub Bartmiński <[email protected]>
Fri, 27 Jul 2018 14:11:44 +0000 (16:11 +0200)
committerChris Wilson <[email protected]>
Fri, 27 Jul 2018 15:03:40 +0000 (16:03 +0100)
There seems to be no reason for doing extra work on WOPCM partitioning
in the case GuC is not used, as the partitioning will not be used by the
intel_wopcm_init_hw function anyway.

Signed-off-by: Jakub Bartmiński <[email protected]>
Cc: Chris Wilson <[email protected]>
Cc: Michał Winiarski <[email protected]>
Cc: Michal Wajdeczko <[email protected]>
Reviewed-by: Chris Wilson <[email protected]>
Signed-off-by: Chris Wilson <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
drivers/gpu/drm/i915/intel_wopcm.c

index 74bf76f3fddc4091d26c9a7227ca689ac7975c19..09cc62b0d7ca26cf7b8b79057af050605bd538a6 100644 (file)
@@ -163,6 +163,9 @@ int intel_wopcm_init(struct intel_wopcm *wopcm)
        u32 guc_wopcm_rsvd;
        int err;
 
+       if (!USES_GUC(dev_priv))
+               return 0;
+
        GEM_BUG_ON(!wopcm->size);
 
        if (guc_fw_size >= wopcm->size) {