* Fwd: [PATCH] drm/i915: Fix enable OA report logic
[not found] <d24e431a-a5ca-6bb0-812c-bb368ee64876@gnu.org>
@ 2020-01-08 12:34 ` Andy Shevchenko
2020-01-08 14:30 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
1 sibling, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2020-01-08 12:34 UTC (permalink / raw)
To: intel-gfx, dri-devel, Jani Nikula, Daniel Vetter
I forwarding this to a (sub)set of correct MLs/maintainers. Please,
follow the instructions they give.
---------- Forwarded message ---------
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Mon, Dec 23, 2019 at 12:17 PM
Subject: [PATCH] drm/i915: Fix enable OA report logic
To: <platform-driver-x86@vger.kernel.org>
Clang raises
drivers/gpu/drm/i915/i915_perf.c:2474:50: warning: operator '?:' has
lower precedence than '|'; '|' will be evaluated first
[-Wbitwise-conditional-parentheses]
!(stream->sample_flags & SAMPLE_OA_REPORT) ?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
drivers/gpu/drm/i915/i915_perf.c:2474:50: note: place parentheses
around the '|' expression to silence this warning
!(stream->sample_flags & SAMPLE_OA_REPORT) ?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
drivers/gpu/drm/i915/i915_perf.c:2474:50: note: place parentheses
around the '?:' expression to evaluate it first
!(stream->sample_flags & SAMPLE_OA_REPORT) ?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
with -Wbitwise-conditional-parentheses and apparently is right
as '|' is evaluated before '?:' which doesn't seem to be the intention
here so let's put parentheses in the right place to fix it.
Signed-off-by: Ebrahim Byagowi <ebrahim@gnu.org>
---
drivers/gpu/drm/i915/i915_perf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 2ae14bc14931..db963f7c2e2e 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -2471,9 +2471,9 @@ static int gen12_enable_metric_set(struct
i915_perf_stream *stream)
* If the user didn't require OA reports,
instruct the
* hardware not to emit ctx switch reports.
*/
- !(stream->sample_flags & SAMPLE_OA_REPORT) ?
-
_MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS) :
-
_MASKED_BIT_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS));
+ (!(stream->sample_flags & SAMPLE_OA_REPORT) ?
+
_MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS) :
+
_MASKED_BIT_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS)));
intel_uncore_write(uncore, GEN12_OAG_OAGLBCTXCTRL, periodic ?
(GEN12_OAG_OAGLBCTXCTRL_COUNTER_RESUME |
--
2.24.0
--
With Best Regards,
Andy Shevchenko
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Intel-gfx] Fwd: [PATCH] drm/i915: Fix enable OA report logic
@ 2020-01-08 12:34 ` Andy Shevchenko
0 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2020-01-08 12:34 UTC (permalink / raw)
To: intel-gfx, dri-devel, Jani Nikula, Daniel Vetter
I forwarding this to a (sub)set of correct MLs/maintainers. Please,
follow the instructions they give.
---------- Forwarded message ---------
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Mon, Dec 23, 2019 at 12:17 PM
Subject: [PATCH] drm/i915: Fix enable OA report logic
To: <platform-driver-x86@vger.kernel.org>
Clang raises
drivers/gpu/drm/i915/i915_perf.c:2474:50: warning: operator '?:' has
lower precedence than '|'; '|' will be evaluated first
[-Wbitwise-conditional-parentheses]
!(stream->sample_flags & SAMPLE_OA_REPORT) ?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
drivers/gpu/drm/i915/i915_perf.c:2474:50: note: place parentheses
around the '|' expression to silence this warning
!(stream->sample_flags & SAMPLE_OA_REPORT) ?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
drivers/gpu/drm/i915/i915_perf.c:2474:50: note: place parentheses
around the '?:' expression to evaluate it first
!(stream->sample_flags & SAMPLE_OA_REPORT) ?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
with -Wbitwise-conditional-parentheses and apparently is right
as '|' is evaluated before '?:' which doesn't seem to be the intention
here so let's put parentheses in the right place to fix it.
Signed-off-by: Ebrahim Byagowi <ebrahim@gnu.org>
---
drivers/gpu/drm/i915/i915_perf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 2ae14bc14931..db963f7c2e2e 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -2471,9 +2471,9 @@ static int gen12_enable_metric_set(struct
i915_perf_stream *stream)
* If the user didn't require OA reports,
instruct the
* hardware not to emit ctx switch reports.
*/
- !(stream->sample_flags & SAMPLE_OA_REPORT) ?
-
_MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS) :
-
_MASKED_BIT_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS));
+ (!(stream->sample_flags & SAMPLE_OA_REPORT) ?
+
_MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS) :
+
_MASKED_BIT_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS)));
intel_uncore_write(uncore, GEN12_OAG_OAGLBCTXCTRL, periodic ?
(GEN12_OAG_OAGLBCTXCTRL_COUNTER_RESUME |
--
2.24.0
--
With Best Regards,
Andy Shevchenko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: Fwd: [PATCH] drm/i915: Fix enable OA report logic
2020-01-08 12:34 ` [Intel-gfx] " Andy Shevchenko
@ 2020-01-08 12:56 ` Jani Nikula
-1 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2020-01-08 12:56 UTC (permalink / raw)
To: Andy Shevchenko, intel-gfx, dri-devel, Daniel Vetter,
Ebrahim Byagowi
On Wed, 08 Jan 2020, Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
> I forwarding this to a (sub)set of correct MLs/maintainers. Please,
> follow the instructions they give.
Thanks, already fixed by commit 9278bbb6e43c ("drm/i915/perf: Reverse a
ternary to make sparse happy") in our -next.
BR,
Jani.
>
> ---------- Forwarded message ---------
> From: Ebrahim Byagowi <ebrahim@gnu.org>
> Date: Mon, Dec 23, 2019 at 12:17 PM
> Subject: [PATCH] drm/i915: Fix enable OA report logic
> To: <platform-driver-x86@vger.kernel.org>
>
>
>
> Clang raises
>
> drivers/gpu/drm/i915/i915_perf.c:2474:50: warning: operator '?:' has
> lower precedence than '|'; '|' will be evaluated first
> [-Wbitwise-conditional-parentheses]
> !(stream->sample_flags & SAMPLE_OA_REPORT) ?
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
> drivers/gpu/drm/i915/i915_perf.c:2474:50: note: place parentheses
> around the '|' expression to silence this warning
> !(stream->sample_flags & SAMPLE_OA_REPORT) ?
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
> drivers/gpu/drm/i915/i915_perf.c:2474:50: note: place parentheses
> around the '?:' expression to evaluate it first
> !(stream->sample_flags & SAMPLE_OA_REPORT) ?
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
>
> with -Wbitwise-conditional-parentheses and apparently is right
> as '|' is evaluated before '?:' which doesn't seem to be the intention
> here so let's put parentheses in the right place to fix it.
>
> Signed-off-by: Ebrahim Byagowi <ebrahim@gnu.org>
> ---
> drivers/gpu/drm/i915/i915_perf.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index 2ae14bc14931..db963f7c2e2e 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -2471,9 +2471,9 @@ static int gen12_enable_metric_set(struct
> i915_perf_stream *stream)
> * If the user didn't require OA reports,
> instruct the
> * hardware not to emit ctx switch reports.
> */
> - !(stream->sample_flags & SAMPLE_OA_REPORT) ?
> -
> _MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS) :
> -
> _MASKED_BIT_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS));
> + (!(stream->sample_flags & SAMPLE_OA_REPORT) ?
> +
> _MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS) :
> +
> _MASKED_BIT_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS)));
>
> intel_uncore_write(uncore, GEN12_OAG_OAGLBCTXCTRL, periodic ?
> (GEN12_OAG_OAGLBCTXCTRL_COUNTER_RESUME |
> --
> 2.24.0
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] Fwd: [PATCH] drm/i915: Fix enable OA report logic
@ 2020-01-08 12:56 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2020-01-08 12:56 UTC (permalink / raw)
To: Andy Shevchenko, intel-gfx, dri-devel, Daniel Vetter,
Ebrahim Byagowi
On Wed, 08 Jan 2020, Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
> I forwarding this to a (sub)set of correct MLs/maintainers. Please,
> follow the instructions they give.
Thanks, already fixed by commit 9278bbb6e43c ("drm/i915/perf: Reverse a
ternary to make sparse happy") in our -next.
BR,
Jani.
>
> ---------- Forwarded message ---------
> From: Ebrahim Byagowi <ebrahim@gnu.org>
> Date: Mon, Dec 23, 2019 at 12:17 PM
> Subject: [PATCH] drm/i915: Fix enable OA report logic
> To: <platform-driver-x86@vger.kernel.org>
>
>
>
> Clang raises
>
> drivers/gpu/drm/i915/i915_perf.c:2474:50: warning: operator '?:' has
> lower precedence than '|'; '|' will be evaluated first
> [-Wbitwise-conditional-parentheses]
> !(stream->sample_flags & SAMPLE_OA_REPORT) ?
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
> drivers/gpu/drm/i915/i915_perf.c:2474:50: note: place parentheses
> around the '|' expression to silence this warning
> !(stream->sample_flags & SAMPLE_OA_REPORT) ?
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
> drivers/gpu/drm/i915/i915_perf.c:2474:50: note: place parentheses
> around the '?:' expression to evaluate it first
> !(stream->sample_flags & SAMPLE_OA_REPORT) ?
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
>
> with -Wbitwise-conditional-parentheses and apparently is right
> as '|' is evaluated before '?:' which doesn't seem to be the intention
> here so let's put parentheses in the right place to fix it.
>
> Signed-off-by: Ebrahim Byagowi <ebrahim@gnu.org>
> ---
> drivers/gpu/drm/i915/i915_perf.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index 2ae14bc14931..db963f7c2e2e 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -2471,9 +2471,9 @@ static int gen12_enable_metric_set(struct
> i915_perf_stream *stream)
> * If the user didn't require OA reports,
> instruct the
> * hardware not to emit ctx switch reports.
> */
> - !(stream->sample_flags & SAMPLE_OA_REPORT) ?
> -
> _MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS) :
> -
> _MASKED_BIT_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS));
> + (!(stream->sample_flags & SAMPLE_OA_REPORT) ?
> +
> _MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS) :
> +
> _MASKED_BIT_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS)));
>
> intel_uncore_write(uncore, GEN12_OAG_OAGLBCTXCTRL, periodic ?
> (GEN12_OAG_OAGLBCTXCTRL_COUNTER_RESUME |
> --
> 2.24.0
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for Fwd: [PATCH] drm/i915: Fix enable OA report logic
[not found] <d24e431a-a5ca-6bb0-812c-bb368ee64876@gnu.org>
2020-01-08 12:34 ` [Intel-gfx] " Andy Shevchenko
@ 2020-01-08 14:30 ` Patchwork
1 sibling, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-01-08 14:30 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: intel-gfx
== Series Details ==
Series: Fwd: [PATCH] drm/i915: Fix enable OA report logic
URL : https://patchwork.freedesktop.org/series/71761/
State : failure
== Summary ==
Applying: Fwd: [PATCH] drm/i915: Fix enable OA report logic
error: corrupt patch at line 19
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Fwd: [PATCH] drm/i915: Fix enable OA report logic
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-01-08 14:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <d24e431a-a5ca-6bb0-812c-bb368ee64876@gnu.org>
2020-01-08 12:34 ` Fwd: [PATCH] drm/i915: Fix enable OA report logic Andy Shevchenko
2020-01-08 12:34 ` [Intel-gfx] " Andy Shevchenko
2020-01-08 12:56 ` Jani Nikula
2020-01-08 12:56 ` [Intel-gfx] " Jani Nikula
2020-01-08 14:30 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.