tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Michał Grzelak <michal.grzelak@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/a9b0151d82b1622daa0625fc8ea2c41d233e4318.1772042022.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Jani Nikula 64c9a6be 31bad44c

+18 -14
+18 -14
drivers/gpu/drm/xe/xe_oa.c
··· 758 758 }, 759 759 { 760 760 RING_CONTEXT_CONTROL(stream->hwe->mmio_base), 761 - REG_MASKED_FIELD(CTX_CTRL_OAC_CONTEXT_ENABLE, 762 - enable ? CTX_CTRL_OAC_CONTEXT_ENABLE : 0) 761 + enable ? 762 + REG_MASKED_FIELD_ENABLE(CTX_CTRL_OAC_CONTEXT_ENABLE) : 763 + REG_MASKED_FIELD_DISABLE(CTX_CTRL_OAC_CONTEXT_ENABLE) 763 764 }, 764 765 }; 765 766 ··· 783 782 }, 784 783 { 785 784 RING_CONTEXT_CONTROL(stream->hwe->mmio_base), 786 - REG_MASKED_FIELD(CTX_CTRL_OAC_CONTEXT_ENABLE, 787 - enable ? CTX_CTRL_OAC_CONTEXT_ENABLE : 0) | 788 - REG_MASKED_FIELD(CTX_CTRL_RUN_ALONE, enable ? CTX_CTRL_RUN_ALONE : 0), 785 + enable ? 786 + REG_MASKED_FIELD_ENABLE(CTX_CTRL_OAC_CONTEXT_ENABLE | CTX_CTRL_RUN_ALONE) : 787 + REG_MASKED_FIELD_DISABLE(CTX_CTRL_OAC_CONTEXT_ENABLE | CTX_CTRL_RUN_ALONE), 789 788 }, 790 789 }; 791 790 ··· 813 812 814 813 static u32 oag_configure_mmio_trigger(const struct xe_oa_stream *stream, bool enable) 815 814 { 816 - return REG_MASKED_FIELD(OAG_OA_DEBUG_DISABLE_MMIO_TRG, 817 - enable && stream && stream->sample ? 818 - 0 : OAG_OA_DEBUG_DISABLE_MMIO_TRG); 815 + if (enable && stream && stream->sample) 816 + return REG_MASKED_FIELD_DISABLE(OAG_OA_DEBUG_DISABLE_MMIO_TRG); 817 + else 818 + return REG_MASKED_FIELD_ENABLE(OAG_OA_DEBUG_DISABLE_MMIO_TRG); 819 819 } 820 820 821 821 static void xe_oa_disable_metric_set(struct xe_oa_stream *stream) ··· 1061 1059 static u32 oag_report_ctx_switches(const struct xe_oa_stream *stream) 1062 1060 { 1063 1061 /* If user didn't require OA reports, ask HW not to emit ctx switch reports */ 1064 - return REG_MASKED_FIELD(OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS, 1065 - stream->sample ? 1066 - 0 : OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS); 1062 + if (stream->sample) 1063 + return REG_MASKED_FIELD_DISABLE(OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS); 1064 + else 1065 + return REG_MASKED_FIELD_ENABLE(OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS); 1067 1066 } 1068 1067 1069 1068 static u32 oag_buf_size_select(const struct xe_oa_stream *stream) 1070 1069 { 1071 - return REG_MASKED_FIELD(OAG_OA_DEBUG_BUF_SIZE_SELECT, 1072 - xe_bo_size(stream->oa_buffer.bo) > SZ_16M ? 1073 - OAG_OA_DEBUG_BUF_SIZE_SELECT : 0); 1070 + if (xe_bo_size(stream->oa_buffer.bo) > SZ_16M) 1071 + return REG_MASKED_FIELD_ENABLE(OAG_OA_DEBUG_BUF_SIZE_SELECT); 1072 + else 1073 + return REG_MASKED_FIELD_DISABLE(OAG_OA_DEBUG_BUF_SIZE_SELECT); 1074 1074 } 1075 1075 1076 1076 static int xe_oa_enable_metric_set(struct xe_oa_stream *stream)