Xe OA Consolidated Diffs
Subsystems (2)
cover Xe OA Consolidated Diffs
Because Xe OA changes between successive revisions are distributed across multiple patches, I am providing a combined diff of all changes in a single patch to help with the code review.
These changes pertain to: https://patchwork.freedesktop.org/series/121084/
Ashutosh Dixit (1):
drm/xe/oa: Combined diff of changes between v15 and v16
drivers/gpu/drm/xe/xe_device.c | 4 ++-- drivers/gpu/drm/xe/xe_oa.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
Signature · 1 line
2.41.0
PATCH 1/1 drm/xe/oa: Combined diff of changes between v15 and v16
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
--- drivers/gpu/drm/xe/xe_device.c | 4 ++-- drivers/gpu/drm/xe/xe_oa.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/xe/xe_device.c +2 -2
@@ -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:
drivers/gpu/drm/xe/xe_oa.c +5 -5
@@ -686,7 +686,7 @@ static int xe_oa_load_with_lri(struct xe_oa_stream *stream, struct xe_oa_reg *restatic 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);
Signature · 1 line
2.41.0
Patchwork
CI✗ CI.Patch_applied: failure for Xe OA Consolidated Diffs
In reply to Ashutosh Dixit== Series Details ==
== Series Details ==
Series: Xe OA Consolidated Diffs
URL : https://patchwork.freedesktop.org/series/134634/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 2bea08bd3129 drm-tip: 2024y-06m-07d-19h-26m-01s UTC integration manifest === git am output follows ===
error: patch failed: drivers/gpu/drm/xe/xe_device.c:662
error: drivers/gpu/drm/xe/xe_device.c: patch does not apply
error: drivers/gpu/drm/xe/xe_oa.c: does not exist in index
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: drm/xe/oa: Combined diff of changes between v15 and v16
Patch failed at 0001 drm/xe/oa: Combined diff of changes between v15 and v16 When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".