Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/perf: prefer REG_MASKED_FIELD_ENABLE() and REG_MASKED_FIELD_DISABLE()
Using REG_MASKED_FIELD_ENABLE() and REG_MASKED_FIELD_DISABLE() is more
obvious to the reader than having the ternary expression inside
REG_MASKED_FIELD().
Reviewed-by: Michał Grzelak <michal.grzelak@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/93caec439ad10ef8b163162c52407abf36df69f5.1772042022.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+7
-7
+7
-7
drivers/gpu/drm/i915/i915_perf.c
+7
-7
drivers/gpu/drm/i915/i915_perf.c
···
2635
2635
{
2636
2636
RING_CONTEXT_CONTROL(ce->engine->mmio_base),
2637
2637
CTX_CONTEXT_CONTROL,
2638
-
REG_MASKED_FIELD(GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE,
2639
-
active ?
2640
-
GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE :
2641
-
0)
2638
+
active ?
2639
+
REG_MASKED_FIELD_ENABLE(GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE) :
2640
+
REG_MASKED_FIELD_DISABLE(GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE),
2642
2641
},
2643
2642
};
2644
2643
···
2846
2847
2847
2848
static u32 oag_report_ctx_switches(const struct i915_perf_stream *stream)
2848
2849
{
2849
-
return REG_MASKED_FIELD(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS,
2850
-
(stream->sample_flags & SAMPLE_OA_REPORT) ?
2851
-
0 : GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS);
2850
+
if (stream->sample_flags & SAMPLE_OA_REPORT)
2851
+
return REG_MASKED_FIELD_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS);
2852
+
else
2853
+
return REG_MASKED_FIELD_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS);
2852
2854
}
2853
2855
2854
2856
static int