Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755614AbdHYRKR (ORCPT ); Fri, 25 Aug 2017 13:10:17 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:36670 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755368AbdHYRKP (ORCPT ); Fri, 25 Aug 2017 13:10:15 -0400 X-Google-Smtp-Source: ADKCNb76JIcxXpRNSjTL2SqzthFYipZBtHND1+YqCBxFEzWHAfOcFENAFELGMIypvRJJqDi7kSTMOw== From: Matthias Kaehlcke To: Daniel Vetter , Jani Nikula , David Airlie Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Tvrtko Ursulin , Chris Wilson , Nick Desaulniers , Matthias Kaehlcke Subject: [PATCH] drm/i915: Mark wait_for_engine() as maybe_unused Date: Fri, 25 Aug 2017 10:09:45 -0700 Message-Id: <20170825170945.156639-1-mka@chromium.org> X-Mailer: git-send-email 2.14.1.342.g6490525c54-goog Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1329 Lines: 35 The only call of wait_for_engine() is wrapped in a GEM_WARN_ON macro, which confusingly suppresses the call unless CONFIG_DRM_I915_DEBUG_GEM is set. According to http://www.spinics.net/lists/intel-gfx/msg128768.html the current behavior is correct, even though it's not obvious. Different solutions to improve GEM_WARN_ON were discussed, but no conclusion was reached. Mark wait_for_engine() as maybe_unused to avoid a compiler warning, according to the above discussion this is still needed evein if GEM_WARN_ON is eventually refactored. Reported-by: Nick Desaulniers Signed-off-by: Matthias Kaehlcke --- drivers/gpu/drm/i915/i915_gem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 969bac8404f1..52d0b7d0082b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3364,7 +3364,8 @@ static int wait_for_timeline(struct i915_gem_timeline *tl, unsigned int flags) return 0; } -static int wait_for_engine(struct intel_engine_cs *engine, int timeout_ms) +static __maybe_unused int wait_for_engine( + struct intel_engine_cs *engine, int timeout_ms) { return wait_for(intel_engine_is_idle(engine), timeout_ms); } -- 2.14.1.342.g6490525c54-goog