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 v14 and v15
drivers/gpu/drm/xe/xe_oa.c | 16 +++++++--------- drivers/gpu/drm/xe/xe_oa.h | 9 +++------ drivers/gpu/drm/xe/xe_perf.c | 6 +++--- 3 files changed, 13 insertions(+), 18 deletions(-)
Signature · 1 line
2.41.0
PATCH 1/1 drm/xe/oa: Combined diff of changes between v14 and v15
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.
* Fix 32 bit build issues
--- drivers/gpu/drm/xe/xe_oa.c | 16 +++++++--------- drivers/gpu/drm/xe/xe_oa.h | 9 +++------ drivers/gpu/drm/xe/xe_perf.c | 6 +++--- 3 files changed, 13 insertions(+), 18 deletions(-)
drivers/gpu/drm/xe/xe_oa.c +7 -9
@@ -401,7 +401,7 @@ static void xe_oa_init_oa_buffer(struct xe_oa_stream *stream)static u32 __format_to_oactrl (const struct xe_oa_format *format,int counter_sel_mask) { -return ((format->counter_select <<__bf_shf (counter_sel_mask)) & counter_sel_mask) | +return ((format->counter_select << (ffs (counter_sel_mask) -1 )) & counter_sel_mask) |REG_FIELD_PREP (OA_OACONTROL_REPORT_BC_MASK , format->bc_report) |REG_FIELD_PREP (OA_OACONTROL_COUNTER_SIZE_MASK , format->counter_size); }
@@ -1698,7 +1698,7 @@ static int xe_oa_user_extensions(struct xe_oa *oa, u64 extension, int ext_numberreturn 0 ; } -int xe_oa_stream_open_ioctl (struct drm_device *dev,void *data,struct drm_file *file) +int xe_oa_stream_open_ioctl (struct drm_device *dev,u64 data,struct drm_file *file) {struct xe_oa *oa = &to_xe_device (dev)->oa;struct xe_file *xef =to_xe_file (file);
@@ -1712,7 +1712,7 @@ int xe_oa_stream_open_ioctl(struct drm_device *dev, void *data, struct drm_filereturn -ENODEV ; } - ret =xe_oa_user_extensions (oa, (u64 )data,0 , ¶m); + ret =xe_oa_user_extensions (oa, data,0 , ¶m);if (ret)return ret;
@@ -1963,8 +1963,7 @@ static int create_dynamic_oa_sysfs_entry(struct xe_oa *oa,return sysfs_create_group (oa->metrics_kobj, &oa_config->sysfs_metric); } -int xe_oa_add_config_ioctl (struct drm_device *dev,void *data, -struct drm_file *file) +int xe_oa_add_config_ioctl (struct drm_device *dev,u64 data,struct drm_file *file) {struct xe_oa *oa = &to_xe_device (dev)->oa;struct drm_xe_oa_config param;
@@ -1983,7 +1982,7 @@ int xe_oa_add_config_ioctl(struct drm_device *dev, void *data,return -EACCES ; } - err =__copy_from_user (¶m, data,sizeof (param)); + err =__copy_from_user (¶m,u64_to_user_ptr (data),sizeof (param));if (XE_IOCTL_DBG (oa->xe, err))return -EFAULT ;
@@ -2059,12 +2058,11 @@ int xe_oa_add_config_ioctl(struct drm_device *dev, void *data,return err; } -int xe_oa_remove_config_ioctl (struct drm_device *dev,void *data, -struct drm_file *file) +int xe_oa_remove_config_ioctl (struct drm_device *dev,u64 data,struct drm_file *file) {struct xe_oa *oa = &to_xe_device (dev)->oa;struct xe_oa_config *oa_config; -u64 arg, *ptr = data; +u64 arg, *ptr =u64_to_user_ptr (data);int ret;if (!oa->xe) {
drivers/gpu/drm/xe/xe_oa.h +3 -6
@@ -18,12 +18,9 @@ int xe_oa_init(struct xe_device *xe);void xe_oa_fini (struct xe_device *xe);void xe_oa_register (struct xe_device *xe);void xe_oa_unregister (struct xe_device *xe); -int xe_oa_stream_open_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); -int xe_oa_add_config_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); -int xe_oa_remove_config_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); +int xe_oa_stream_open_ioctl (struct drm_device *dev,u64 data,struct drm_file *file); +int xe_oa_add_config_ioctl (struct drm_device *dev,u64 data,struct drm_file *file); +int xe_oa_remove_config_ioctl (struct drm_device *dev,u64 data,struct drm_file *file);u32 xe_oa_timestamp_frequency (struct xe_gt *gt);u16 xe_oa_unit_id (struct xe_hw_engine *hwe);
drivers/gpu/drm/xe/xe_perf.c +3 -3
@@ -17,11 +17,11 @@ static int xe_oa_ioctl(struct drm_device *dev, struct drm_xe_perf_param *arg, {switch (arg->perf_op) {case DRM_XE_PERF_OP_STREAM_OPEN : -return xe_oa_stream_open_ioctl (dev, (void *)arg->param, file); +return xe_oa_stream_open_ioctl (dev, arg->param, file);case DRM_XE_PERF_OP_ADD_CONFIG : -return xe_oa_add_config_ioctl (dev, (void *)arg->param, file); +return xe_oa_add_config_ioctl (dev, arg->param, file);case DRM_XE_PERF_OP_REMOVE_CONFIG : -return xe_oa_remove_config_ioctl (dev, (void *)arg->param, file); +return xe_oa_remove_config_ioctl (dev, arg->param, file);default :return -EINVAL ; }
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/134056/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 573842e9ab57 drm-tip: 2024y-05m-24d-13h-04m-26s UTC integration manifest === git am output follows ===
error: drivers/gpu/drm/xe/xe_oa.c: does not exist in index
error: drivers/gpu/drm/xe/xe_oa.h: does not exist in index
error: drivers/gpu/drm/xe/xe_perf.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 v14 and v15
Patch failed at 0001 drm/xe/oa: Combined diff of changes between v14 and v15 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".