Commit 64c9a6be authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/xe/oa: 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/a9b0151d82b1622daa0625fc8ea2c41d233e4318.1772042022.git.jani.nikula@intel.com


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

drivers/gpu/drm/xe/xe_oa.c

+18 −14
Original line number Diff line number Diff line
@@ -758,8 +758,9 @@ static int xe_oa_configure_oar_context(struct xe_oa_stream *stream, bool enable) 
		},

		{

			RING_CONTEXT_CONTROL(stream->hwe->mmio_base),

			REG_MASKED_FIELD(CTX_CTRL_OAC_CONTEXT_ENABLE,

					 enable ? CTX_CTRL_OAC_CONTEXT_ENABLE : 0)

			enable ?

			REG_MASKED_FIELD_ENABLE(CTX_CTRL_OAC_CONTEXT_ENABLE) :

			REG_MASKED_FIELD_DISABLE(CTX_CTRL_OAC_CONTEXT_ENABLE)

		},

	};
@@ -782,9 +783,9 @@ static int xe_oa_configure_oac_context(struct xe_oa_stream *stream, bool enable) 
		},

		{

			RING_CONTEXT_CONTROL(stream->hwe->mmio_base),

			REG_MASKED_FIELD(CTX_CTRL_OAC_CONTEXT_ENABLE,

					 enable ? CTX_CTRL_OAC_CONTEXT_ENABLE : 0) |

			REG_MASKED_FIELD(CTX_CTRL_RUN_ALONE, enable ? CTX_CTRL_RUN_ALONE : 0),

			enable ?

			REG_MASKED_FIELD_ENABLE(CTX_CTRL_OAC_CONTEXT_ENABLE | CTX_CTRL_RUN_ALONE) :

			REG_MASKED_FIELD_DISABLE(CTX_CTRL_OAC_CONTEXT_ENABLE | CTX_CTRL_RUN_ALONE),

		},

	};
@@ -812,9 +813,10 @@ static int xe_oa_configure_oa_context(struct xe_oa_stream *stream, bool enable) 


static u32 oag_configure_mmio_trigger(const struct xe_oa_stream *stream, bool enable)

{

	return REG_MASKED_FIELD(OAG_OA_DEBUG_DISABLE_MMIO_TRG,

				enable && stream && stream->sample ?

				0 : OAG_OA_DEBUG_DISABLE_MMIO_TRG);

	if (enable && stream && stream->sample)

		return REG_MASKED_FIELD_DISABLE(OAG_OA_DEBUG_DISABLE_MMIO_TRG);

	else

		return REG_MASKED_FIELD_ENABLE(OAG_OA_DEBUG_DISABLE_MMIO_TRG);

}



static void xe_oa_disable_metric_set(struct xe_oa_stream *stream)
@@ -1059,16 +1061,18 @@ static int xe_oa_emit_oa_config(struct xe_oa_stream *stream, struct xe_oa_config 
static u32 oag_report_ctx_switches(const struct xe_oa_stream *stream)

{

	/* If user didn't require OA reports, ask HW not to emit ctx switch reports */

	return REG_MASKED_FIELD(OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS,

				stream->sample ?

				0 : OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS);

	if (stream->sample)

		return REG_MASKED_FIELD_DISABLE(OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS);

	else

		return REG_MASKED_FIELD_ENABLE(OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS);

}



static u32 oag_buf_size_select(const struct xe_oa_stream *stream)

{

	return REG_MASKED_FIELD(OAG_OA_DEBUG_BUF_SIZE_SELECT,

				xe_bo_size(stream->oa_buffer.bo) > SZ_16M ?

				OAG_OA_DEBUG_BUF_SIZE_SELECT : 0);

	if (xe_bo_size(stream->oa_buffer.bo) > SZ_16M)

		return REG_MASKED_FIELD_ENABLE(OAG_OA_DEBUG_BUF_SIZE_SELECT);

	else

		return REG_MASKED_FIELD_DISABLE(OAG_OA_DEBUG_BUF_SIZE_SELECT);

}



static int xe_oa_enable_metric_set(struct xe_oa_stream *stream)