Skip to content

Commit

Permalink
drm/i915: Don't try to place HWS in non-existing mappable region
Browse files Browse the repository at this point in the history
HWS placement restrictions can't just rely on HAS_LLC flag.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Acked-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/20191029095856.25431-5-matthew.auld@intel.com
  • Loading branch information
Michal Wajdeczko authored and Chris Wilson committed Oct 29, 2019
1 parent 895d8eb commit 4dc0a7c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/gt/intel_engine_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ static int pin_ggtt_status_page(struct intel_engine_cs *engine,
unsigned int flags;

flags = PIN_GLOBAL;
if (!HAS_LLC(engine->i915))
if (!HAS_LLC(engine->i915) && i915_ggtt_has_aperture(engine->gt->ggtt))
/*
* On g33, we cannot place HWS above 256MiB, so
* restrict its pinning to the low mappable arena.
Expand Down

0 comments on commit 4dc0a7c

Please sign in to comment.