Commit 41c52415 authored by John Harrison's avatar John Harrison Committed by Daniel Vetter

drm/i915: Remove the now redundant 'obj->ring'

The ring member of the object structure was always updated with the
last_read_seqno member. Thus with the conversion to last_read_req, obj->ring is
now a direct copy of obj->last_read_req->ring. This makes it somewhat redundant
and potentially misleading (especially as there was no comment to explain its
purpose).

This checkin removes the redundant field. Many uses were simply testing for
non-null to see if the object is active on the GPU. Some of these have been
converted to check 'obj->active' instead. Others (where the last_read_req is
about to be used anyway) have been changed to check obj->last_read_req. The rest
simply pull the ring out from the request structure and proceed as before.

For: VIZ-4377
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarThomas Daniel <Thomas.Daniel@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1b5a433a
...@@ -166,8 +166,9 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) ...@@ -166,8 +166,9 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
*t = '\0'; *t = '\0';
seq_printf(m, " (%s mappable)", s); seq_printf(m, " (%s mappable)", s);
} }
if (obj->ring != NULL) if (obj->last_read_req != NULL)
seq_printf(m, " (%s)", obj->ring->name); seq_printf(m, " (%s)",
i915_gem_request_get_ring(obj->last_read_req)->name);
if (obj->frontbuffer_bits) if (obj->frontbuffer_bits)
seq_printf(m, " (frontbuffer: 0x%03x)", obj->frontbuffer_bits); seq_printf(m, " (frontbuffer: 0x%03x)", obj->frontbuffer_bits);
} }
...@@ -334,7 +335,7 @@ static int per_file_stats(int id, void *ptr, void *data) ...@@ -334,7 +335,7 @@ static int per_file_stats(int id, void *ptr, void *data)
if (ppgtt->file_priv != stats->file_priv) if (ppgtt->file_priv != stats->file_priv)
continue; continue;
if (obj->ring) /* XXX per-vma statistic */ if (obj->active) /* XXX per-vma statistic */
stats->active += obj->base.size; stats->active += obj->base.size;
else else
stats->inactive += obj->base.size; stats->inactive += obj->base.size;
...@@ -344,7 +345,7 @@ static int per_file_stats(int id, void *ptr, void *data) ...@@ -344,7 +345,7 @@ static int per_file_stats(int id, void *ptr, void *data)
} else { } else {
if (i915_gem_obj_ggtt_bound(obj)) { if (i915_gem_obj_ggtt_bound(obj)) {
stats->global += obj->base.size; stats->global += obj->base.size;
if (obj->ring) if (obj->active)
stats->active += obj->base.size; stats->active += obj->base.size;
else else
stats->inactive += obj->base.size; stats->inactive += obj->base.size;
......
...@@ -1941,8 +1941,6 @@ struct drm_i915_gem_object { ...@@ -1941,8 +1941,6 @@ struct drm_i915_gem_object {
void *dma_buf_vmapping; void *dma_buf_vmapping;
int vmapping_count; int vmapping_count;
struct intel_engine_cs *ring;
/** Breadcrumb of last rendering to the buffer. */ /** Breadcrumb of last rendering to the buffer. */
struct drm_i915_gem_request *last_read_req; struct drm_i915_gem_request *last_read_req;
struct drm_i915_gem_request *last_write_req; struct drm_i915_gem_request *last_write_req;
......
...@@ -2263,14 +2263,18 @@ static void ...@@ -2263,14 +2263,18 @@ static void
i915_gem_object_move_to_active(struct drm_i915_gem_object *obj, i915_gem_object_move_to_active(struct drm_i915_gem_object *obj,
struct intel_engine_cs *ring) struct intel_engine_cs *ring)
{ {
struct drm_i915_gem_request *req = intel_ring_get_request(ring); struct drm_i915_gem_request *req;
struct intel_engine_cs *old_ring;
BUG_ON(ring == NULL); BUG_ON(ring == NULL);
if (obj->ring != ring && obj->last_write_req) {
req = intel_ring_get_request(ring);
old_ring = i915_gem_request_get_ring(obj->last_read_req);
if (old_ring != ring && obj->last_write_req) {
/* Keep the request relative to the current ring */ /* Keep the request relative to the current ring */
i915_gem_request_assign(&obj->last_write_req, req); i915_gem_request_assign(&obj->last_write_req, req);
} }
obj->ring = ring;
/* Add a reference if we're newly entering the active list. */ /* Add a reference if we're newly entering the active list. */
if (!obj->active) { if (!obj->active) {
...@@ -2309,7 +2313,6 @@ i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj) ...@@ -2309,7 +2313,6 @@ i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
intel_fb_obj_flush(obj, true); intel_fb_obj_flush(obj, true);
list_del_init(&obj->ring_list); list_del_init(&obj->ring_list);
obj->ring = NULL;
i915_gem_request_assign(&obj->last_read_req, NULL); i915_gem_request_assign(&obj->last_read_req, NULL);
i915_gem_request_assign(&obj->last_write_req, NULL); i915_gem_request_assign(&obj->last_write_req, NULL);
...@@ -2326,9 +2329,7 @@ i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj) ...@@ -2326,9 +2329,7 @@ i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
static void static void
i915_gem_object_retire(struct drm_i915_gem_object *obj) i915_gem_object_retire(struct drm_i915_gem_object *obj)
{ {
struct intel_engine_cs *ring = obj->ring; if (obj->last_read_req == NULL)
if (ring == NULL)
return; return;
if (i915_gem_request_completed(obj->last_read_req, true)) if (i915_gem_request_completed(obj->last_read_req, true))
...@@ -2861,14 +2862,17 @@ i915_gem_idle_work_handler(struct work_struct *work) ...@@ -2861,14 +2862,17 @@ i915_gem_idle_work_handler(struct work_struct *work)
static int static int
i915_gem_object_flush_active(struct drm_i915_gem_object *obj) i915_gem_object_flush_active(struct drm_i915_gem_object *obj)
{ {
struct intel_engine_cs *ring;
int ret; int ret;
if (obj->active) { if (obj->active) {
ring = i915_gem_request_get_ring(obj->last_read_req);
ret = i915_gem_check_olr(obj->last_read_req); ret = i915_gem_check_olr(obj->last_read_req);
if (ret) if (ret)
return ret; return ret;
i915_gem_retire_requests_ring(obj->ring); i915_gem_retire_requests_ring(ring);
} }
return 0; return 0;
...@@ -2971,10 +2975,12 @@ int ...@@ -2971,10 +2975,12 @@ int
i915_gem_object_sync(struct drm_i915_gem_object *obj, i915_gem_object_sync(struct drm_i915_gem_object *obj,
struct intel_engine_cs *to) struct intel_engine_cs *to)
{ {
struct intel_engine_cs *from = obj->ring; struct intel_engine_cs *from;
u32 seqno; u32 seqno;
int ret, idx; int ret, idx;
from = i915_gem_request_get_ring(obj->last_read_req);
if (from == NULL || to == from) if (from == NULL || to == from)
return 0; return 0;
...@@ -3929,7 +3935,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj, ...@@ -3929,7 +3935,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,
bool was_pin_display; bool was_pin_display;
int ret; int ret;
if (pipelined != obj->ring) { if (pipelined != i915_gem_request_get_ring(obj->last_read_req)) {
ret = i915_gem_object_sync(obj, pipelined); ret = i915_gem_object_sync(obj, pipelined);
if (ret) if (ret)
return ret; return ret;
...@@ -4284,9 +4290,11 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, ...@@ -4284,9 +4290,11 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
ret = i915_gem_object_flush_active(obj); ret = i915_gem_object_flush_active(obj);
args->busy = obj->active; args->busy = obj->active;
if (obj->ring) { if (obj->last_read_req) {
struct intel_engine_cs *ring;
BUILD_BUG_ON(I915_NUM_RINGS > 16); BUILD_BUG_ON(I915_NUM_RINGS > 16);
args->busy |= intel_ring_flag(obj->ring) << 16; ring = i915_gem_request_get_ring(obj->last_read_req);
args->busy |= intel_ring_flag(ring) << 16;
} }
drm_gem_object_unreference(&obj->base); drm_gem_object_unreference(&obj->base);
......
...@@ -619,7 +619,8 @@ static int do_switch(struct intel_engine_cs *ring, ...@@ -619,7 +619,8 @@ static int do_switch(struct intel_engine_cs *ring,
* swapped, but there is no way to do that yet. * swapped, but there is no way to do that yet.
*/ */
from->legacy_hw_ctx.rcs_state->dirty = 1; from->legacy_hw_ctx.rcs_state->dirty = 1;
BUG_ON(from->legacy_hw_ctx.rcs_state->ring != ring); BUG_ON(i915_gem_request_get_ring(
from->legacy_hw_ctx.rcs_state->last_read_req) != ring);
/* obj is kept alive until the next request by its active ref */ /* obj is kept alive until the next request by its active ref */
i915_gem_object_ggtt_unpin(from->legacy_hw_ctx.rcs_state); i915_gem_object_ggtt_unpin(from->legacy_hw_ctx.rcs_state);
......
...@@ -683,7 +683,8 @@ static void capture_bo(struct drm_i915_error_buffer *err, ...@@ -683,7 +683,8 @@ static void capture_bo(struct drm_i915_error_buffer *err,
err->dirty = obj->dirty; err->dirty = obj->dirty;
err->purgeable = obj->madv != I915_MADV_WILLNEED; err->purgeable = obj->madv != I915_MADV_WILLNEED;
err->userptr = obj->userptr.mm != NULL; err->userptr = obj->userptr.mm != NULL;
err->ring = obj->ring ? obj->ring->id : -1; err->ring = obj->last_read_req ?
i915_gem_request_get_ring(obj->last_read_req)->id : -1;
err->cache_level = obj->cache_level; err->cache_level = obj->cache_level;
} }
......
...@@ -9528,7 +9528,7 @@ static bool use_mmio_flip(struct intel_engine_cs *ring, ...@@ -9528,7 +9528,7 @@ static bool use_mmio_flip(struct intel_engine_cs *ring,
else if (i915.enable_execlists) else if (i915.enable_execlists)
return true; return true;
else else
return ring != obj->ring; return ring != i915_gem_request_get_ring(obj->last_read_req);
} }
static void skl_do_mmio_flip(struct intel_crtc *intel_crtc) static void skl_do_mmio_flip(struct intel_crtc *intel_crtc)
...@@ -9888,7 +9888,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, ...@@ -9888,7 +9888,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
} else if (IS_IVYBRIDGE(dev)) { } else if (IS_IVYBRIDGE(dev)) {
ring = &dev_priv->ring[BCS]; ring = &dev_priv->ring[BCS];
} else if (INTEL_INFO(dev)->gen >= 7) { } else if (INTEL_INFO(dev)->gen >= 7) {
ring = obj->ring; ring = i915_gem_request_get_ring(obj->last_read_req);
if (ring == NULL || ring->id != RCS) if (ring == NULL || ring->id != RCS)
ring = &dev_priv->ring[BCS]; ring = &dev_priv->ring[BCS];
} else { } else {
...@@ -9910,7 +9910,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, ...@@ -9910,7 +9910,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
i915_gem_request_assign(&work->flip_queued_req, i915_gem_request_assign(&work->flip_queued_req,
obj->last_write_req); obj->last_write_req);
work->flip_queued_ring = obj->ring; work->flip_queued_ring =
i915_gem_request_get_ring(obj->last_write_req);
} else { } else {
ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, ring, ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, ring,
page_flip_flags); page_flip_flags);
......
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