Skip to content

Commit

Permalink
drm/i915/guc: Do not partition WOPCM if GuC is not used
Browse files Browse the repository at this point in the history
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 <jakub.bartminski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180727141148.30874-2-jakub.bartminski@intel.com
  • Loading branch information
Jakub Bartmiński authored and Chris Wilson committed Jul 27, 2018
1 parent 9936ef5 commit b6445e1
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/intel_wopcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit b6445e1

Please sign in to comment.