[PATCH 16/17] drm/xe/oa: Changes to OA_TAKEN

[Umesh Nerlige Ramappa]

On Mon, Mar 11, 2024 at 08:40:02PM -0700, Ashutosh Dixit wrote:
>Rename OA_TAKEN to xe_oa_circ_diff, since xe_oa_circ_diff better describes
>what the macro actually does. Also convert to function and add xe_oa_stream
>arg. These will be used in the following patch.
>
>Signed-off-by: Ashutosh Dixit <ashutosh.dixit at intel.com>

Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>

Umesh
>---
> drivers/gpu/drm/xe/xe_oa.c | 22 +++++++++++++---------
> 1 file changed, 13 insertions(+), 9 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
>index b33976db1da5..6f5bbb0787d9 100644
>--- a/drivers/gpu/drm/xe/xe_oa.c
>+++ b/drivers/gpu/drm/xe/xe_oa.c
>@@ -28,7 +28,6 @@
> #include "xe_sched_job.h"
> #include "xe_perf.h"
>
>-#define OA_TAKEN(tail, head)	(((tail) - (head)) & (XE_OA_BUFFER_SIZE - 1))
> #define DEFAULT_POLL_FREQUENCY_HZ 200
> #define DEFAULT_POLL_PERIOD_NS (NSEC_PER_SEC / DEFAULT_POLL_FREQUENCY_HZ)
> #define XE_OA_UNIT_INVALID U32_MAX
>@@ -105,6 +104,11 @@ static const struct xe_oa_format oa_formats[] = {
> 	[XE_OA_FORMAT_PEC36u64_G1_4_G2_32]	= { 4, 320, DRM_FMT(PEC), HDR_64_BIT, 1, 0 },
> };
>
>+static u32 xe_oa_circ_diff(struct xe_oa_stream *stream, u32 tail, u32 head)
>+{
>+	return (tail - head) & (XE_OA_BUFFER_SIZE - 1);
>+}
>+
> static void xe_oa_config_release(struct kref *ref)
> {
> 	struct xe_oa_config *oa_config =
>@@ -209,11 +213,11 @@ static bool xe_oa_buffer_check_unlocked(struct xe_oa_stream *stream)
> 	 * increments. Also report size may not be a power of 2. Compute potential
> 	 * partially landed report in OA buffer.
> 	 */
>-	partial_report_size = OA_TAKEN(hw_tail, stream->oa_buffer.tail);
>+	partial_report_size = xe_oa_circ_diff(stream, hw_tail, stream->oa_buffer.tail);
> 	partial_report_size %= report_size;
>
> 	/* Subtract partial amount off the tail */
>-	hw_tail = OA_TAKEN(hw_tail, partial_report_size);
>+	hw_tail = xe_oa_circ_diff(stream, hw_tail, partial_report_size);
>
> 	tail = hw_tail;
>
>@@ -225,24 +229,24 @@ static bool xe_oa_buffer_check_unlocked(struct xe_oa_stream *stream)
> 	 * This is assuming that the writes of the OA unit land in memory in the order
> 	 * they were written.  If not : (╯°□°）╯︵ ┻━┻
> 	 */
>-	while (OA_TAKEN(tail, stream->oa_buffer.tail) >= report_size) {
>+	while (xe_oa_circ_diff(stream, tail, stream->oa_buffer.tail) >= report_size) {
> 		void *report = stream->oa_buffer.vaddr + tail;
>
> 		if (oa_report_id(stream, report) || oa_timestamp(stream, report))
> 			break;
>
>-		tail = OA_TAKEN(tail, report_size);
>+		tail = xe_oa_circ_diff(stream, tail, report_size);
> 	}
>
>-	if (OA_TAKEN(hw_tail, tail) > report_size)
>+	if (xe_oa_circ_diff(stream, hw_tail, tail) > report_size)
> 		drm_dbg(&stream->oa->xe->drm,
> 			"unlanded report(s) head=0x%x tail=0x%x hw_tail=0x%x\n",
> 			stream->oa_buffer.head, tail, hw_tail);
>
> 	stream->oa_buffer.tail = tail;
>
>-	pollin = OA_TAKEN(stream->oa_buffer.tail,
>-			  stream->oa_buffer.head) >= report_size;
>+	pollin = xe_oa_circ_diff(stream, stream->oa_buffer.tail,
>+				 stream->oa_buffer.head) >= report_size;
>
> 	spin_unlock_irqrestore(&stream->oa_buffer.ptr_lock, flags);
>
>@@ -315,7 +319,7 @@ static int xe_oa_append_reports(struct xe_oa_stream *stream, char __user *buf,
>
> 	xe_assert(stream->oa->xe, head < XE_OA_BUFFER_SIZE && tail < XE_OA_BUFFER_SIZE);
>
>-	for (; OA_TAKEN(tail, head); head = (head + report_size) & mask) {
>+	for (; xe_oa_circ_diff(stream, tail, head); head = (head + report_size) & mask) {
> 		u8 *report = oa_buf_base + head;
>
> 		ret = xe_oa_append_report(stream, buf, count, offset, report);
>-- 
>2.41.0
>