* [PATCH] drm/i915: mark wait_for_engine() __maybe_unused
@ 2017-05-21 4:03 Nick Desaulniers
2017-05-23 8:39 ` [Intel-gfx] " Tvrtko Ursulin
0 siblings, 1 reply; 2+ messages in thread
From: Nick Desaulniers @ 2017-05-21 4:03 UTC (permalink / raw)
Cc: daniel.vetter, jani.nikula, airlied, intel-gfx, dri-devel,
linux-kernel, Nick Desaulniers
This solves a warning when compiling the driver with Clang, -Werror enabled,
and CONFIG_DRM_I915_DEBUG_GEM unset, since Clang warns that:
drivers/gpu/drm/i915/i915_gem.c:3274:12: error: function
'wait_for_engine' is not needed
and will not be emitted [-Werror,-Wunneeded-internal-declaration]
static int wait_for_engine(struct intel_engine_cs *engine, int
timeout_ms)
^
Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com>
---
Additionally, it only has one call site. Should I mark it inline, too, while
I'm at it?
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 b6ac3df18b58..73b82fb94b0e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3271,7 +3271,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.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: mark wait_for_engine() __maybe_unused
2017-05-21 4:03 [PATCH] drm/i915: mark wait_for_engine() __maybe_unused Nick Desaulniers
@ 2017-05-23 8:39 ` Tvrtko Ursulin
0 siblings, 0 replies; 2+ messages in thread
From: Tvrtko Ursulin @ 2017-05-23 8:39 UTC (permalink / raw)
To: Nick Desaulniers
Cc: airlied, intel-gfx, linux-kernel, dri-devel, daniel.vetter
Hi,
On 21/05/2017 05:03, Nick Desaulniers wrote:
> This solves a warning when compiling the driver with Clang, -Werror enabled,
> and CONFIG_DRM_I915_DEBUG_GEM unset, since Clang warns that:
>
> drivers/gpu/drm/i915/i915_gem.c:3274:12: error: function
> 'wait_for_engine' is not needed
> and will not be emitted [-Werror,-Wunneeded-internal-declaration]
> static int wait_for_engine(struct intel_engine_cs *engine, int
> timeout_ms)
> ^
You have actually uncovered a bug here where the call is not supposed to
be optional in the first place. I'll send a different fix and copy you
on it.
Regards,
Tvrtko
> Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com>
> ---
> Additionally, it only has one call site. Should I mark it inline, too, while
> I'm at it?
>
> 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 b6ac3df18b58..73b82fb94b0e 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -3271,7 +3271,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);
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-23 8:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-21 4:03 [PATCH] drm/i915: mark wait_for_engine() __maybe_unused Nick Desaulniers
2017-05-23 8:39 ` [Intel-gfx] " Tvrtko Ursulin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).