Commit db45fb5b authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: Compartmentalize ring buffer creation

Continuing on the theme of compartmentalizing the code better to make
future split between gt and display in global i915 clearer.

v2:
 * Pass in ggtt instead of gt. (Chris)
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-29-tvrtko.ursulin@linux.intel.com
parent d8a44248
...@@ -1234,16 +1234,16 @@ void intel_ring_unpin(struct intel_ring *ring) ...@@ -1234,16 +1234,16 @@ void intel_ring_unpin(struct intel_ring *ring)
i915_timeline_unpin(ring->timeline); i915_timeline_unpin(ring->timeline);
} }
static struct i915_vma * static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size)
intel_ring_create_vma(struct drm_i915_private *dev_priv, int size)
{ {
struct i915_address_space *vm = &dev_priv->ggtt.vm; struct i915_address_space *vm = &ggtt->vm;
struct drm_i915_private *i915 = vm->i915;
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
struct i915_vma *vma; struct i915_vma *vma;
obj = i915_gem_object_create_stolen(dev_priv, size); obj = i915_gem_object_create_stolen(i915, size);
if (!obj) if (!obj)
obj = i915_gem_object_create_internal(dev_priv, size); obj = i915_gem_object_create_internal(i915, size);
if (IS_ERR(obj)) if (IS_ERR(obj))
return ERR_CAST(obj); return ERR_CAST(obj);
...@@ -1270,6 +1270,7 @@ intel_engine_create_ring(struct intel_engine_cs *engine, ...@@ -1270,6 +1270,7 @@ intel_engine_create_ring(struct intel_engine_cs *engine,
struct i915_timeline *timeline, struct i915_timeline *timeline,
int size) int size)
{ {
struct drm_i915_private *i915 = engine->i915;
struct intel_ring *ring; struct intel_ring *ring;
struct i915_vma *vma; struct i915_vma *vma;
...@@ -1290,12 +1291,12 @@ intel_engine_create_ring(struct intel_engine_cs *engine, ...@@ -1290,12 +1291,12 @@ intel_engine_create_ring(struct intel_engine_cs *engine,
* of the buffer. * of the buffer.
*/ */
ring->effective_size = size; ring->effective_size = size;
if (IS_I830(engine->i915) || IS_I845G(engine->i915)) if (IS_I830(i915) || IS_I845G(i915))
ring->effective_size -= 2 * CACHELINE_BYTES; ring->effective_size -= 2 * CACHELINE_BYTES;
intel_ring_update_space(ring); intel_ring_update_space(ring);
vma = intel_ring_create_vma(engine->i915, size); vma = create_ring_vma(engine->gt->ggtt, size);
if (IS_ERR(vma)) { if (IS_ERR(vma)) {
kfree(ring); kfree(ring);
return ERR_CAST(vma); return ERR_CAST(vma);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment