Commit 31bad44c authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarMichał Grzelak <michal.grzelak@intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/93caec439ad10ef8b163162c52407abf36df69f5.1772042022.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent dd249a16

drivers/gpu/drm/i915/i915_perf.c

+7 −7
Original line number Diff line number Diff line
@@ -2635,10 +2635,9 @@ static int gen12_configure_oar_context(struct i915_perf_stream *stream, 
		{

			RING_CONTEXT_CONTROL(ce->engine->mmio_base),

			CTX_CONTEXT_CONTROL,

			REG_MASKED_FIELD(GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE,

			active ?

					 GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE :

					 0)

			REG_MASKED_FIELD_ENABLE(GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE) :

			REG_MASKED_FIELD_DISABLE(GEN12_CTX_CTRL_OAR_CONTEXT_ENABLE),

		},

	};
@@ -2847,9 +2846,10 @@ gen8_enable_metric_set(struct i915_perf_stream *stream, 


static u32 oag_report_ctx_switches(const struct i915_perf_stream *stream)

{

	return REG_MASKED_FIELD(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS,

				(stream->sample_flags & SAMPLE_OA_REPORT) ?

				0 : GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS);

	if (stream->sample_flags & SAMPLE_OA_REPORT)

		return REG_MASKED_FIELD_DISABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS);

	else

		return REG_MASKED_FIELD_ENABLE(GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS);

}



static int