[PATCH 1/1] drm/xe/oa: Combined diff of changes between v15 and v16

[Ashutosh Dixit <ashutosh.dixit@intel.com>]

Because Xe OA changes between successive revisions are distributed across
multiple patches, provide a combined diff of all changes in a single patch
to help with code review.

These changes pertain to: https://patchwork.freedesktop.org/series/121084/

This patch will not compile, it's purpose is to just provide the diff.

* Rebase on latest Xe changes and a few label renames

Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
 drivers/gpu/drm/xe/xe_device.c |  4 ++--
 drivers/gpu/drm/xe/xe_oa.c     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index d61c56b13ec3..d29d8689d4ec 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -662,7 +662,7 @@ int xe_device_probe(struct xe_device *xe)
 
 	err = xe_display_init(xe);
 	if (err)
-		goto err_oa_fini;
+		goto err_fini_oa;
 
 	err = drm_dev_register(&xe->drm, 0);
 	if (err)
@@ -681,7 +681,7 @@ int xe_device_probe(struct xe_device *xe)
 err_fini_display:
 	xe_display_driver_remove(xe);
 
-err_oa_fini:
+err_fini_oa:
 	xe_oa_fini(xe);
 
 err_fini_gt:
diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
index 3ed4ca19f9cd..d0a46485571a 100644
--- a/drivers/gpu/drm/xe/xe_oa.c
+++ b/drivers/gpu/drm/xe/xe_oa.c
@@ -686,7 +686,7 @@ static int xe_oa_load_with_lri(struct xe_oa_stream *stream, struct xe_oa_reg *re
 static int xe_oa_configure_oar_context(struct xe_oa_stream *stream, bool enable)
 {
 	const struct xe_oa_format *format = stream->oa_buffer.format;
-	struct xe_lrc *lrc = &stream->exec_q->lrc[0];
+	struct xe_lrc *lrc = stream->exec_q->lrc[0];
 	u32 regs_offset = xe_lrc_regs_offset(lrc) / sizeof(u32);
 	u32 oacontrol = __format_to_oactrl(format, OAR_OACONTROL_COUNTER_SEL_MASK) |
 		(enable ? OAR_OACONTROL_COUNTER_ENABLE : 0);
@@ -708,7 +708,7 @@ static int xe_oa_configure_oar_context(struct xe_oa_stream *stream, bool enable)
 	int err;
 
 	/* Modify stream hwe context image with regs_context */
-	err = xe_oa_modify_ctx_image(stream, &stream->exec_q->lrc[0],
+	err = xe_oa_modify_ctx_image(stream, stream->exec_q->lrc[0],
 				     regs_context, ARRAY_SIZE(regs_context));
 	if (err)
 		return err;
@@ -720,7 +720,7 @@ static int xe_oa_configure_oar_context(struct xe_oa_stream *stream, bool enable)
 static int xe_oa_configure_oac_context(struct xe_oa_stream *stream, bool enable)
 {
 	const struct xe_oa_format *format = stream->oa_buffer.format;
-	struct xe_lrc *lrc = &stream->exec_q->lrc[0];
+	struct xe_lrc *lrc = stream->exec_q->lrc[0];
 	u32 regs_offset = xe_lrc_regs_offset(lrc) / sizeof(u32);
 	u32 oacontrol = __format_to_oactrl(format, OAR_OACONTROL_COUNTER_SEL_MASK) |
 		(enable ? OAR_OACONTROL_COUNTER_ENABLE : 0);
@@ -746,7 +746,7 @@ static int xe_oa_configure_oac_context(struct xe_oa_stream *stream, bool enable)
 	xe_mmio_write32(stream->gt, __oa_regs(stream)->oa_ctrl, __oa_ccs_select(stream));
 
 	/* Modify stream hwe context image with regs_context */
-	err = xe_oa_modify_ctx_image(stream, &stream->exec_q->lrc[0],
+	err = xe_oa_modify_ctx_image(stream, stream->exec_q->lrc[0],
 				     regs_context, ARRAY_SIZE(regs_context));
 	if (err)
 		return err;
@@ -1238,7 +1238,7 @@ static bool xe_oa_find_reg_in_lri(u32 *state, u32 reg, u32 *offset, u32 end)
 
 static u32 xe_oa_context_image_offset(struct xe_oa_stream *stream, u32 reg)
 {
-	struct xe_lrc *lrc = &stream->exec_q->lrc[0];
+	struct xe_lrc *lrc = stream->exec_q->lrc[0];
 	u32 len = (xe_gt_lrc_size(stream->gt, stream->hwe->class) +
 		   lrc->ring.size) / sizeof(u32);
 	u32 offset = xe_lrc_regs_offset(lrc) / sizeof(u32);
-- 
2.41.0