Commit d51a75ac authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/xe/rtp: Simplify marking active workarounds 



Stop doing the calculation both in rtp_mark_active() and in its caller.
The caller easily knows the number of entries to mark, so just pass it
forward. That also simplifies rtp_mark_active() since now it doesn't
have a special case when handling 1 entry.

Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240727015907.899192-7-lucas.demarchi@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 6da8acfd

drivers/gpu/drm/xe/xe_rtp.c

+5 −9
Original line number Diff line number Diff line
@@ -221,18 +221,15 @@ EXPORT_SYMBOL_IF_KUNIT(xe_rtp_process_ctx_enable_active_tracking); 


static void rtp_mark_active(struct xe_device *xe,

			    struct xe_rtp_process_ctx *ctx,

			    unsigned int first, unsigned int last)

			    unsigned int first, unsigned int n_entries)

{

	if (!ctx->active_entries)

		return;



	if (drm_WARN_ON(&xe->drm, last > ctx->n_entries))

	if (drm_WARN_ON(&xe->drm, first + n_entries > ctx->n_entries))

		return;



	if (first == last)

		bitmap_set(ctx->active_entries, first, 1);

	else

		bitmap_set(ctx->active_entries, first, last - first + 1);

	bitmap_set(ctx->active_entries, first, n_entries);

}



/**
@@ -277,8 +274,7 @@ void xe_rtp_process_to_sr(struct xe_rtp_process_ctx *ctx, 
		}



		if (match)

			rtp_mark_active(xe, ctx, entry - entries,

					entry - entries);

			rtp_mark_active(xe, ctx, entry - entries, 1);

	}

}

EXPORT_SYMBOL_IF_KUNIT(xe_rtp_process_to_sr);
@@ -324,7 +320,7 @@ void xe_rtp_process(struct xe_rtp_process_ctx *ctx, 
		entry--;



		rtp_mark_active(xe, ctx, first_entry - entries,

				entry - entries);

				entry - first_entry + 1);

	}

}

EXPORT_SYMBOL_IF_KUNIT(xe_rtp_process);