Commit 24327f83 authored by Joonas Lahtinen's avatar Joonas Lahtinen

drm/i915: Remove two sloppy inline functions from .h

Get rid of sloppy inline functions now that we don't have more users:

i915_gem_request_get_seqno
i915_gem_request_get_engine

v2:
- request->engine is always non-NULL (Chris)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1478589108-3702-1-git-send-email-joonas.lahtinen@linux.intel.com
parent 58e197d6
...@@ -547,11 +547,11 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) ...@@ -547,11 +547,11 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)
pipe, plane); pipe, plane);
} }
if (work->flip_queued_req) { if (work->flip_queued_req) {
struct intel_engine_cs *engine = i915_gem_request_get_engine(work->flip_queued_req); struct intel_engine_cs *engine = work->flip_queued_req->engine;
seq_printf(m, "Flip queued on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n", seq_printf(m, "Flip queued on %s at seqno %x, next seqno %x [current breadcrumb %x], completed? %d\n",
engine->name, engine->name,
i915_gem_request_get_seqno(work->flip_queued_req), work->flip_queued_req->global_seqno,
atomic_read(&dev_priv->gt.global_timeline.next_seqno), atomic_read(&dev_priv->gt.global_timeline.next_seqno),
intel_engine_get_seqno(engine), intel_engine_get_seqno(engine),
i915_gem_request_completed(work->flip_queued_req)); i915_gem_request_completed(work->flip_queued_req));
......
...@@ -162,18 +162,6 @@ int i915_gem_request_add_to_client(struct drm_i915_gem_request *req, ...@@ -162,18 +162,6 @@ int i915_gem_request_add_to_client(struct drm_i915_gem_request *req,
struct drm_file *file); struct drm_file *file);
void i915_gem_request_retire_upto(struct drm_i915_gem_request *req); void i915_gem_request_retire_upto(struct drm_i915_gem_request *req);
static inline u32
i915_gem_request_get_seqno(struct drm_i915_gem_request *req)
{
return req ? req->global_seqno : 0;
}
static inline struct intel_engine_cs *
i915_gem_request_get_engine(struct drm_i915_gem_request *req)
{
return req ? req->engine : NULL;
}
static inline struct drm_i915_gem_request * static inline struct drm_i915_gem_request *
to_request(struct dma_fence *fence) to_request(struct dma_fence *fence)
{ {
......
...@@ -861,16 +861,19 @@ i915_error_object_create(struct drm_i915_private *i915, ...@@ -861,16 +861,19 @@ i915_error_object_create(struct drm_i915_private *i915,
static inline uint32_t static inline uint32_t
__active_get_seqno(struct i915_gem_active *active) __active_get_seqno(struct i915_gem_active *active)
{ {
return i915_gem_request_get_seqno(__i915_gem_active_peek(active)); struct drm_i915_gem_request *request;
request = __i915_gem_active_peek(active);
return request ? request->global_seqno : 0;
} }
static inline int static inline int
__active_get_engine_id(struct i915_gem_active *active) __active_get_engine_id(struct i915_gem_active *active)
{ {
struct intel_engine_cs *engine; struct drm_i915_gem_request *request;
engine = i915_gem_request_get_engine(__i915_gem_active_peek(active)); request = __i915_gem_active_peek(active);
return engine ? engine->id : -1; return request ? request->engine->id : -1;
} }
static void capture_bo(struct drm_i915_error_buffer *err, static void capture_bo(struct drm_i915_error_buffer *err,
......
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