diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-17 09:58:35 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-17 11:42:10 +0000 |
| commit | cf274daadd696170b2f6139a825430a1d8976b50 (patch) | |
| tree | bf3e6f2f51c6029ffbf99abf70a72a9f3b7fa7ef /drivers/gpu/drm/i915/gt/intel_lrc.c | |
| parent | drm/i915: switch vlv_suspend to use intel uncore register accessors (diff) | |
| download | wireguard-linux-cf274daadd696170b2f6139a825430a1d8976b50.tar.xz wireguard-linux-cf274daadd696170b2f6139a825430a1d8976b50.zip | |
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: 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
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_lrc.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index 78e854440949..ba31cbe8c68e 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -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; } |