diff options
| author | Joonas Lahtinen | 2016-11-08 08:11:48 +0100 |
|---|---|---|
| committer | Joonas Lahtinen | 2016-11-08 11:36:35 +0100 |
| commit | 24327f837f07fbab99fe3d4abb1e4158e7ca2d76 (patch) | |
| tree | 1888eeb6e69397df995ec59e33cea86cf86c10b9 /drivers/gpu/drm/i915/i915_gpu_error.c | |
| parent | drm/i915: Update DRIVER_DATE to 20161108 (diff) | |
| download | kernel-qcow2-linux-24327f837f07fbab99fe3d4abb1e4158e7ca2d76.tar.gz kernel-qcow2-linux-24327f837f07fbab99fe3d4abb1e4158e7ca2d76.tar.xz kernel-qcow2-linux-24327f837f07fbab99fe3d4abb1e4158e7ca2d76.zip | |
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: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1478589108-3702-1-git-send-email-joonas.lahtinen@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gpu_error.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gpu_error.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 204093f3eaa5..0dc5d93eec6a 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -861,16 +861,19 @@ out: static inline uint32_t __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 __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)); - return engine ? engine->id : -1; + request = __i915_gem_active_peek(active); + return request ? request->engine->id : -1; } static void capture_bo(struct drm_i915_error_buffer *err, |