Commit cf274daa authored by Chris Wilson's avatar Chris Wilson

drm/i915/gt: Rearrange code to silence compiler

Without selftests enabled, I915_SELFTEST_ONLY becomes a dummy,
generating a bare '0'. This causes the compiler to complain about a
useless line, and while we could use I915_SELFTEST_DECLARE instead, it
is a bit messier. Move the selftest-only code to a helper and make that
conditional on having selftests enabled.
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200217095835.599827-1-chris@chris-wilson.co.uk
parent c72e451e
...@@ -1206,6 +1206,14 @@ static u32 intel_context_get_runtime(const struct intel_context *ce) ...@@ -1206,6 +1206,14 @@ static u32 intel_context_get_runtime(const struct intel_context *ce)
return READ_ONCE(ce->lrc_reg_state[CTX_TIMESTAMP]); return READ_ONCE(ce->lrc_reg_state[CTX_TIMESTAMP]);
} }
static void st_update_runtime_underflow(struct intel_context *ce, s32 dt)
{
#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
ce->runtime.num_underflow += dt < 0;
ce->runtime.max_underflow = max_t(u32, ce->runtime.max_underflow, -dt);
#endif
}
static void intel_context_update_runtime(struct intel_context *ce) static void intel_context_update_runtime(struct intel_context *ce)
{ {
u32 old; u32 old;
...@@ -1221,9 +1229,7 @@ static void intel_context_update_runtime(struct intel_context *ce) ...@@ -1221,9 +1229,7 @@ static void intel_context_update_runtime(struct intel_context *ce)
if (unlikely(dt <= 0)) { if (unlikely(dt <= 0)) {
CE_TRACE(ce, "runtime underflow: last=%u, new=%u, delta=%d\n", CE_TRACE(ce, "runtime underflow: last=%u, new=%u, delta=%d\n",
old, ce->runtime.last, dt); old, ce->runtime.last, dt);
I915_SELFTEST_ONLY(ce->runtime.num_underflow += dt < 0); st_update_runtime_underflow(ce, dt);
I915_SELFTEST_ONLY(ce->runtime.max_underflow =
max_t(u32, ce->runtime.max_underflow, -dt));
return; return;
} }
......
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