diff options
author | Ashutosh Dixit <ashutosh.dixit@intel.com> | 2024-07-05 14:43:02 -0700 |
---|---|---|
committer | Ashutosh Dixit <ashutosh.dixit@intel.com> | 2024-07-05 18:19:13 -0700 |
commit | 0bad6be63f625fda5aca7e57ac2bd11751a92864 (patch) | |
tree | ffa62e97f34e2f8fd82c1de0cc4e50440c1ff294 /lib | |
parent | a1743ac7ed91ce40d742a351b1600da4f75972b1 (diff) |
drm-uapi/xe: Sync with Perf/Observation layer uapi updates
Align with kernel commit 8169b2097d88 ("drm/xe/uapi: Rename xe perf layer
as xe observation layer") which changes uapi to rename perf streams to
observation streams.
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/xe/xe_oa.c | 18 | ||||
-rw-r--r-- | lib/xe/xe_oa.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/xe/xe_oa.c b/lib/xe/xe_oa.c index 576358fe2..98c53620d 100644 --- a/lib/xe/xe_oa.c +++ b/lib/xe/xe_oa.c @@ -688,7 +688,7 @@ load_metric_set_config(struct intel_xe_perf_metric_set *metric_set, int drm_fd) memcpy(regs, metric_set->flex_regs, 2 * metric_set->n_flex_regs * sizeof(u32)); regs += 2 * metric_set->n_flex_regs * sizeof(u32); - ret = intel_xe_perf_ioctl(drm_fd, DRM_XE_PERF_OP_ADD_CONFIG, &config); + ret = intel_xe_perf_ioctl(drm_fd, DRM_XE_OBSERVATION_OP_ADD_CONFIG, &config); if (ret >= 0) metric_set->perf_oa_metrics_set = ret; @@ -1042,31 +1042,31 @@ static void xe_oa_prop_to_ext(struct intel_xe_oa_open_prop *properties, ext[j].base.next_extension = to_user_pointer(&ext[j + 1]); } -int intel_xe_perf_ioctl(int fd, enum drm_xe_perf_op op, void *arg) +int intel_xe_perf_ioctl(int fd, enum drm_xe_observation_op op, void *arg) { #define XE_OA_MAX_SET_PROPERTIES 16 struct drm_xe_ext_set_property ext[XE_OA_MAX_SET_PROPERTIES] = {}; /* Chain the PERF layer struct */ - struct drm_xe_perf_param p = { + struct drm_xe_observation_param p = { .extensions = 0, - .perf_type = DRM_XE_PERF_TYPE_OA, - .perf_op = op, - .param = to_user_pointer((op == DRM_XE_PERF_OP_STREAM_OPEN) ? ext : arg), + .observation_type = DRM_XE_OBSERVATION_TYPE_OA, + .observation_op = op, + .param = to_user_pointer((op == DRM_XE_OBSERVATION_OP_STREAM_OPEN) ? ext : arg), }; - if (op == DRM_XE_PERF_OP_STREAM_OPEN) { + if (op == DRM_XE_OBSERVATION_OP_STREAM_OPEN) { struct intel_xe_oa_open_prop *oprop = (struct intel_xe_oa_open_prop *)arg; igt_assert_lte(oprop->num_properties, XE_OA_MAX_SET_PROPERTIES); xe_oa_prop_to_ext(oprop, ext); } - return igt_ioctl(fd, DRM_IOCTL_XE_PERF, &p); + return igt_ioctl(fd, DRM_IOCTL_XE_OBSERVATION, &p); } -void intel_xe_perf_ioctl_err(int fd, enum drm_xe_perf_op op, void *arg, int err) +void intel_xe_perf_ioctl_err(int fd, enum drm_xe_observation_op op, void *arg, int err) { igt_assert_eq(intel_xe_perf_ioctl(fd, op, arg), -1); igt_assert_eq(errno, err); diff --git a/lib/xe/xe_oa.h b/lib/xe/xe_oa.h index f6f2768b0..d5f59a381 100644 --- a/lib/xe/xe_oa.h +++ b/lib/xe/xe_oa.h @@ -398,8 +398,8 @@ uint64_t intel_xe_perf_read_record_timestamp_raw(const struct intel_xe_perf *per const char *intel_xe_perf_read_report_reason(const struct intel_xe_perf *perf, const struct intel_xe_perf_record_header *record); -int intel_xe_perf_ioctl(int fd, enum drm_xe_perf_op op, void *arg); -void intel_xe_perf_ioctl_err(int fd, enum drm_xe_perf_op op, void *arg, int err); +int intel_xe_perf_ioctl(int fd, enum drm_xe_observation_op op, void *arg); +void intel_xe_perf_ioctl_err(int fd, enum drm_xe_observation_op op, void *arg, int err); #ifdef __cplusplus }; |