From: Matthew Auld Date: Tue, 29 Oct 2019 09:58:55 +0000 (+0000) Subject: drm/i915: don't allocate the ring in stolen if we lack aperture X-Git-Tag: v5.15~4946^2~30^2~42 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34a6baa2df9db77dc65979e9c334a3097f6b7d9f;p=platform%2Fkernel%2Flinux-starfive.git drm/i915: don't allocate the ring in stolen if we lack aperture Since we have no way access it from the CPU. For such cases just fallback to internal objects. Signed-off-by: Matthew Auld Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20191029095856.25431-6-matthew.auld@intel.com --- diff --git a/drivers/gpu/drm/i915/gt/intel_ring.c b/drivers/gpu/drm/i915/gt/intel_ring.c index fa01c14..ece2050 100644 --- a/drivers/gpu/drm/i915/gt/intel_ring.c +++ b/drivers/gpu/drm/i915/gt/intel_ring.c @@ -108,7 +108,9 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size) struct drm_i915_gem_object *obj; struct i915_vma *vma; - obj = i915_gem_object_create_stolen(i915, size); + obj = ERR_PTR(-ENODEV); + if (i915_ggtt_has_aperture(ggtt)) + obj = i915_gem_object_create_stolen(i915, size); if (IS_ERR(obj)) obj = i915_gem_object_create_internal(i915, size); if (IS_ERR(obj))