[PATCH 57/81] drm/i915: Rename residual ringbuf parameters
Chris Wilson
chris at chris-wilson.co.uk
Sat Apr 16 12:50:52 UTC 2016
Now that we have a clear ring/engine split and a struct intel_ring, we
no longer need the stopgap ringbuf names.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_ringbuffer.c | 104 ++++++++++++++++----------------
drivers/gpu/drm/i915/intel_ringbuffer.h | 14 ++---
2 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index cb202b533e41..993d797a5bf9 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -42,15 +42,15 @@ int __intel_ring_space(int head, int tail, int size)
return space - I915_RING_FREE_SPACE;
}
-void intel_ring_update_space(struct intel_ring *ringbuf)
+void intel_ring_update_space(struct intel_ring *ring)
{
- if (ringbuf->last_retired_head != -1) {
- ringbuf->head = ringbuf->last_retired_head;
- ringbuf->last_retired_head = -1;
+ if (ring->last_retired_head != -1) {
+ ring->head = ring->last_retired_head;
+ ring->last_retired_head = -1;
}
- ringbuf->space = __intel_ring_space(ringbuf->head & HEAD_ADDR,
- ringbuf->tail, ringbuf->size);
+ ring->space = __intel_ring_space(ring->head & HEAD_ADDR,
+ ring->tail, ring->size);
}
static void __intel_engine_submit(struct intel_engine_cs *engine)
@@ -551,8 +551,8 @@ void intel_engine_init_hangcheck(struct intel_engine_cs *engine)
static int init_ring_common(struct intel_engine_cs *engine)
{
struct drm_i915_private *dev_priv = to_i915(engine);
- struct intel_ring *ringbuf = engine->buffer;
- struct drm_i915_gem_object *obj = ringbuf->obj;
+ struct intel_ring *ring = engine->buffer;
+ struct drm_i915_gem_object *obj = ring->obj;
int ret = 0;
intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
@@ -602,7 +602,7 @@ static int init_ring_common(struct intel_engine_cs *engine)
(void)I915_READ_HEAD(engine);
I915_WRITE_CTL(engine,
- ((ringbuf->size - PAGE_SIZE) & RING_NR_PAGES)
+ ((ring->size - PAGE_SIZE) & RING_NR_PAGES)
| RING_VALID);
/* If the head is still not zero, the ring is dead */
@@ -621,10 +621,10 @@ static int init_ring_common(struct intel_engine_cs *engine)
goto out;
}
- ringbuf->last_retired_head = -1;
- ringbuf->head = I915_READ_HEAD(engine);
- ringbuf->tail = I915_READ_TAIL(engine) & TAIL_ADDR;
- intel_ring_update_space(ringbuf);
+ ring->last_retired_head = -1;
+ ring->head = I915_READ_HEAD(engine);
+ ring->tail = I915_READ_TAIL(engine) & TAIL_ADDR;
+ intel_ring_update_space(ring);
intel_engine_init_hangcheck(engine);
@@ -1858,21 +1858,21 @@ static int init_phys_status_page(struct intel_engine_cs *engine)
return 0;
}
-void intel_unpin_ring(struct intel_ring *ringbuf)
+void intel_unpin_ring(struct intel_ring *ring)
{
- if (HAS_LLC(ringbuf->obj) && !ringbuf->obj->stolen)
- i915_gem_object_unpin_map(ringbuf->obj);
+ if (HAS_LLC(ring->obj) && !ring->obj->stolen)
+ i915_gem_object_unpin_map(ring->obj);
else
- iounmap(ringbuf->virtual_start);
- ringbuf->vma = NULL;
- i915_gem_object_ggtt_unpin(ringbuf->obj);
+ 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 *ringbuf)
+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 = ringbuf->obj;
+ 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;
@@ -1886,8 +1886,8 @@ int intel_pin_and_map_ring(struct drm_device *dev, struct intel_ring *ringbuf)
if (ret)
goto err_unpin;
- ringbuf->virtual_start = i915_gem_object_pin_map(obj);
- if (ringbuf->virtual_start == NULL) {
+ ring->virtual_start = i915_gem_object_pin_map(obj);
+ if (ring->virtual_start == NULL) {
ret = -ENOMEM;
goto err_unpin;
}
@@ -1904,15 +1904,15 @@ int intel_pin_and_map_ring(struct drm_device *dev, struct intel_ring *ringbuf)
/* Access through the GTT requires the device to be awake. */
assert_rpm_wakelock_held(dev_priv);
- ringbuf->virtual_start = ioremap_wc(ggtt->mappable_base +
- i915_gem_obj_ggtt_offset(obj), ringbuf->size);
- if (ringbuf->virtual_start == NULL) {
+ ring->virtual_start = ioremap_wc(ggtt->mappable_base +
+ i915_gem_obj_ggtt_offset(obj), ring->size);
+ if (ring->virtual_start == NULL) {
ret = -ENOMEM;
goto err_unpin;
}
}
- ringbuf->vma = i915_gem_obj_to_ggtt(obj);
+ ring->vma = i915_gem_obj_to_ggtt(obj);
return 0;
err_unpin:
@@ -1920,29 +1920,29 @@ err_unpin:
return ret;
}
-static void intel_destroy_ringbuffer_obj(struct intel_ring *ringbuf)
+static void intel_destroy_ringbuffer_obj(struct intel_ring *ring)
{
- drm_gem_object_unreference(&ringbuf->obj->base);
- ringbuf->obj = NULL;
+ drm_gem_object_unreference(&ring->obj->base);
+ ring->obj = NULL;
}
static int intel_alloc_ringbuffer_obj(struct drm_device *dev,
- struct intel_ring *ringbuf)
+ struct intel_ring *ring)
{
struct drm_i915_gem_object *obj;
obj = NULL;
if (!HAS_LLC(dev))
- obj = i915_gem_object_create_stolen(dev, ringbuf->size);
+ obj = i915_gem_object_create_stolen(dev, ring->size);
if (obj == NULL)
- obj = i915_gem_alloc_object(dev, ringbuf->size);
+ obj = i915_gem_alloc_object(dev, ring->size);
if (obj == NULL)
return -ENOMEM;
/* mark ring buffers as read-only from GPU side by default */
obj->gt_ro = 1;
- ringbuf->obj = obj;
+ ring->obj = obj;
return 0;
}
@@ -1998,7 +1998,7 @@ intel_ring_free(struct intel_ring *ring)
static int intel_init_engine(struct drm_device *dev,
struct intel_engine_cs *engine)
{
- struct intel_ring *ringbuf;
+ struct intel_ring *ring;
int ret;
WARN_ON(engine->buffer);
@@ -2016,12 +2016,12 @@ static int intel_init_engine(struct drm_device *dev,
intel_engine_init_breadcrumbs(engine);
- ringbuf = intel_engine_create_ring(engine, 32 * PAGE_SIZE);
- if (IS_ERR(ringbuf)) {
- ret = PTR_ERR(ringbuf);
+ ring = intel_engine_create_ring(engine, 32 * PAGE_SIZE);
+ if (IS_ERR(ring)) {
+ ret = PTR_ERR(ring);
goto error;
}
- engine->buffer = ringbuf;
+ engine->buffer = ring;
if (I915_NEED_GFX_HWS(dev)) {
ret = init_status_page(engine);
@@ -2034,11 +2034,11 @@ static int intel_init_engine(struct drm_device *dev,
goto error;
}
- ret = intel_pin_and_map_ring(dev, ringbuf);
+ ret = intel_pin_and_map_ring(dev, ring);
if (ret) {
DRM_ERROR("Failed to pin and map ringbuffer %s: %d\n",
engine->name, ret);
- intel_destroy_ringbuffer_obj(ringbuf);
+ intel_destroy_ringbuffer_obj(ring);
goto error;
}
@@ -2111,27 +2111,27 @@ int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request)
return 0;
}
-void intel_ring_reserved_space_reserve(struct intel_ring *ringbuf, int size)
+void intel_ring_reserved_space_reserve(struct intel_ring *ring, int size)
{
- GEM_BUG_ON(ringbuf->reserved_size);
- ringbuf->reserved_size = size;
+ GEM_BUG_ON(ring->reserved_size);
+ ring->reserved_size = size;
}
-void intel_ring_reserved_space_cancel(struct intel_ring *ringbuf)
+void intel_ring_reserved_space_cancel(struct intel_ring *ring)
{
- GEM_BUG_ON(!ringbuf->reserved_size);
- ringbuf->reserved_size = 0;
+ GEM_BUG_ON(!ring->reserved_size);
+ ring->reserved_size = 0;
}
-void intel_ring_reserved_space_use(struct intel_ring *ringbuf)
+void intel_ring_reserved_space_use(struct intel_ring *ring)
{
- GEM_BUG_ON(!ringbuf->reserved_size);
- ringbuf->reserved_size = 0;
+ GEM_BUG_ON(!ring->reserved_size);
+ ring->reserved_size = 0;
}
-void intel_ring_reserved_space_end(struct intel_ring *ringbuf)
+void intel_ring_reserved_space_end(struct intel_ring *ring)
{
- GEM_BUG_ON(ringbuf->reserved_size);
+ GEM_BUG_ON(ring->reserved_size);
}
static int wait_for_space(struct drm_i915_gem_request *req, int bytes)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 6637d3caf9ef..74803efe1271 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -477,7 +477,7 @@ static inline void intel_ring_advance(struct intel_ring *ring)
ring->tail &= ring->size - 1;
}
int __intel_ring_space(int head, int tail, int size);
-void intel_ring_update_space(struct intel_ring *ringbuf);
+void intel_ring_update_space(struct intel_ring *ring);
int __must_check intel_engine_idle(struct intel_engine_cs *engine);
void intel_engine_init_seqno(struct intel_engine_cs *engine, u32 seqno);
@@ -501,9 +501,9 @@ static inline u32 intel_engine_get_seqno(struct intel_engine_cs *engine)
int init_workarounds_ring(struct intel_engine_cs *engine);
-static inline u32 intel_ring_get_tail(struct intel_ring *ringbuf)
+static inline u32 intel_ring_get_tail(struct intel_ring *ring)
{
- return ringbuf->tail;
+ return ring->tail;
}
/*
@@ -520,13 +520,13 @@ static inline u32 intel_ring_get_tail(struct intel_ring *ringbuf)
* will always have sufficient room to do its stuff. The request creation
* code calls this automatically.
*/
-void intel_ring_reserved_space_reserve(struct intel_ring *ringbuf, int size);
+void intel_ring_reserved_space_reserve(struct intel_ring *ring, int size);
/* Cancel the reservation, e.g. because the request is being discarded. */
-void intel_ring_reserved_space_cancel(struct intel_ring *ringbuf);
+void intel_ring_reserved_space_cancel(struct intel_ring *ring);
/* Use the reserved space - for use by i915_add_request() only. */
-void intel_ring_reserved_space_use(struct intel_ring *ringbuf);
+void intel_ring_reserved_space_use(struct intel_ring *ring);
/* Finish with the reserved space - for use by i915_add_request() only. */
-void intel_ring_reserved_space_end(struct intel_ring *ringbuf);
+void intel_ring_reserved_space_end(struct intel_ring *ring);
/* intel_breadcrumbs.c -- user interrupt bottom-half for waiters */
struct intel_wait {
--
2.8.0.rc3
More information about the Intel-gfx-trybot
mailing list