[PATCH 58/81] drm/i915: Rename intel_pin_and_map_ring()
Chris Wilson
chris at chris-wilson.co.uk
Sat Apr 16 18:11:15 UTC 2016
For more consistent oop-naming, we would use intel_ring_verb, so pick
intel_ring_pin() and intel_ring_unpin().
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_lrc.c | 4 ++--
drivers/gpu/drm/i915/intel_ringbuffer.c | 38 ++++++++++++++++-----------------
drivers/gpu/drm/i915/intel_ringbuffer.h | 4 ++--
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 3f5f6865a2da..888b2b6fd128 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -953,7 +953,7 @@ static int intel_lr_context_pin(struct intel_context *ctx,
lrc_reg_state = vaddr + LRC_STATE_PN * PAGE_SIZE;
ring = ctx->engine[engine->id].ring;
- ret = intel_pin_and_map_ring(engine->dev, ring);
+ ret = intel_ring_pin(ring);
if (ret)
goto unpin_map;
@@ -989,7 +989,7 @@ void intel_lr_context_unpin(struct intel_context *ctx,
return;
i915_gem_object_unpin_map(ctx_obj);
- intel_unpin_ring(ctx->engine[engine->id].ring);
+ intel_ring_unpin(ctx->engine[engine->id].ring);
i915_gem_object_ggtt_unpin(ctx_obj);
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 993d797a5bf9..803e5428c85f 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1858,26 +1858,14 @@ static int init_phys_status_page(struct intel_engine_cs *engine)
return 0;
}
-void intel_unpin_ring(struct intel_ring *ring)
+int intel_ring_pin(struct intel_ring *ring)
{
- if (HAS_LLC(ring->obj) && !ring->obj->stolen)
- i915_gem_object_unpin_map(ring->obj);
- else
- iounmap(ring->virtual_start);
- ring->vma = NULL;
- i915_gem_object_ggtt_unpin(ring->obj);
-}
-
-int intel_pin_and_map_ring(struct drm_device *dev, struct intel_ring *ring)
-{
- struct drm_i915_private *dev_priv = to_i915(dev);
- struct i915_ggtt *ggtt = &dev_priv->ggtt;
struct drm_i915_gem_object *obj = ring->obj;
/* Ring wraparound at offset 0 sometimes hangs. No idea why. */
unsigned flags = PIN_OFFSET_BIAS | 4096;
int ret;
- if (HAS_LLC(dev_priv) && !obj->stolen) {
+ if (HAS_LLC(ring) && !obj->stolen) {
ret = i915_gem_obj_ggtt_pin(obj, PAGE_SIZE, flags);
if (ret)
return ret;
@@ -1902,10 +1890,12 @@ int intel_pin_and_map_ring(struct drm_device *dev, struct intel_ring *ring)
goto err_unpin;
/* Access through the GTT requires the device to be awake. */
- assert_rpm_wakelock_held(dev_priv);
+ assert_rpm_wakelock_held(to_i915(ring));
- ring->virtual_start = ioremap_wc(ggtt->mappable_base +
- i915_gem_obj_ggtt_offset(obj), ring->size);
+ ring->virtual_start =
+ ioremap_wc(to_i915(ring)->ggtt.mappable_base +
+ i915_gem_obj_ggtt_offset(obj),
+ ring->size);
if (ring->virtual_start == NULL) {
ret = -ENOMEM;
goto err_unpin;
@@ -1920,6 +1910,16 @@ err_unpin:
return ret;
}
+void intel_ring_unpin(struct intel_ring *ring)
+{
+ if (HAS_LLC(ring) && !ring->obj->stolen)
+ i915_gem_object_unpin_map(ring->obj);
+ else
+ iounmap(ring->virtual_start);
+ i915_gem_object_ggtt_unpin(ring->obj);
+ ring->vma = NULL;
+}
+
static void intel_destroy_ringbuffer_obj(struct intel_ring *ring)
{
drm_gem_object_unreference(&ring->obj->base);
@@ -2034,7 +2034,7 @@ static int intel_init_engine(struct drm_device *dev,
goto error;
}
- ret = intel_pin_and_map_ring(dev, ring);
+ ret = intel_ring_pin(ring);
if (ret) {
DRM_ERROR("Failed to pin and map ringbuffer %s: %d\n",
engine->name, ret);
@@ -2066,7 +2066,7 @@ void intel_engine_cleanup(struct intel_engine_cs *engine)
intel_engine_stop(engine);
WARN_ON(!IS_GEN2(engine) && (I915_READ_MODE(engine) & MODE_IDLE) == 0);
- intel_unpin_ring(engine->buffer);
+ intel_ring_unpin(engine->buffer);
intel_ring_free(engine->buffer);
engine->buffer = NULL;
}
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 74803efe1271..6e530a344947 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -452,8 +452,8 @@ intel_write_status_page(struct intel_engine_cs *engine,
struct intel_ring *
intel_engine_create_ring(struct intel_engine_cs *engine, int size);
-int intel_pin_and_map_ring(struct drm_device *dev, struct intel_ring *ring);
-void intel_unpin_ring(struct intel_ring *ring);
+int intel_ring_pin(struct intel_ring *ring);
+void intel_ring_unpin(struct intel_ring *ring);
void intel_ring_free(struct intel_ring *ring);
void intel_engine_stop(struct intel_engine_cs *engine);
--
2.8.0.rc3
More information about the Intel-gfx-trybot
mailing list