AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-22 12:32:00 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915/gt: Rearrange code to silence compiler

Browse Source 
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: kbuild test robot <lkp@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200217095835.599827-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2020-02-17 09:58:35 +00:00
parent c72e451e98
commit cf274daadd
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/i915/gt/intel_lrc.c
View File

@ -1206,6 +1206,14 @@ static u32 intel_context_get_runtime(const struct intel_context *ce)
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)
{
u32 old;
@ -1221,9 +1229,7 @@ static void intel_context_update_runtime(struct intel_context *ce)
if (unlikely(dt <= 0)) {
CE_TRACE(ce, "runtime underflow: last=%u, new=%u, delta=%d\n",
old, ce->runtime.last, dt);
I915_SELFTEST_ONLY(ce->runtime.num_underflow += dt < 0);
I915_SELFTEST_ONLY(ce->runtime.max_underflow =
max_t(u32, ce->runtime.max_underflow, -dt));
st_update_runtime_underflow(ce, dt);
return;
}