Quoting Jakub Bartmiński (2018-07-27 09:53:46) > 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@xxxxxxxxx> > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Michał Winiarski <michal.winiarski@xxxxxxxxx> > Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_wopcm.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c > index 74bf76f3fddc..09cc62b0d7ca 100644 > --- a/drivers/gpu/drm/i915/intel_wopcm.c > +++ b/drivers/gpu/drm/i915/intel_wopcm.c > @@ -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); My personal preference would be that wopcm->size = 0 if !USES_GUC, but hey ho. Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
