[Intel-gfx] [PATCH] drm/i915/perf: Reverse a ternary to make sparse happy

[Lionel Landwerlin]

On 01/11/2019 20:18, Chris Wilson wrote:
> Avoid
>
> drivers/gpu/drm/i915/i915_perf.c:2442:85: warning: dubious: x | !y
>
> simply by inverting the predicate and reversing the ternary.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>
> Cc: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>


Thanks a lot,


-Lionel


> ---
>   drivers/gpu/drm/i915/i915_perf.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index 6e35b9255882..acd65da50651 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -2441,12 +2441,12 @@ static int gen12_enable_metric_set(struct i915_perf_stream *stream)
>   			   _MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CLK_RATIO_REPORTS |
>   					      GEN12_OAG_OA_DEBUG_INCLUDE_CLK_RATIO) |
>   			   /*
> -			    * If the user didn't require OA reports, instruct the
> -			    * hardware not to emit ctx switch reports.
> +			    * 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_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS) :
> +			   _MASKED_BIT_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS));
>   
>   	intel_uncore_write(uncore, GEN12_OAG_OAGLBCTXCTRL, periodic ?
>   			   (GEN12_OAG_OAGLBCTXCTRL_COUNTER_RESUME |