From: Chris Wilson Date: Mon, 17 Feb 2020 09:58:35 +0000 (+0000) Subject: drm/i915/gt: Rearrange code to silence compiler X-Git-Tag: baikal/mips/sdk5.9~13997^2~18^2~67 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=52e742f2bee4134f26098d75b796b0408eeee327;p=kernel.git 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 Signed-off-by: Chris Wilson Reviewed-by: Matthew Auld Link: https://patchwork.freedesktop.org/patch/msgid/20200217095835.599827-1-chris@chris-wilson.co.uk --- diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index 78e854440949e..ba31cbe8c68e0 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; }