AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/perf: fix enum type for eu stall props

Browse Source 
src/intel/perf/xe/intel_perf.c:420:27: warning: implicit conversion from enumeration type 'enum drm_xe_eu_stall_property_id' to different enumeration type 'enum drm_xe_oa_property_id' [-Wenum-conversion]

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37172>
This commit is contained in:
Eric Engestrom
2025-09-04 11:40:55 +02:00
committed by Marge Bot
parent 8f543a0ee1
commit 03ff41e747
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/perf/xe/intel_perf.c
+19 -5
View File
@@ -175,8 +175,8 @@ xe_remove_config(struct intel_perf_config *perf, int fd, uint64_t config_id)
}
static void
oa_prop_set(struct drm_xe_ext_set_property *props, uint32_t *index,
enum drm_xe_oa_property_id prop_id, uint64_t value)
xe_prop_set(struct drm_xe_ext_set_property *props, uint32_t *index,
uint32_t prop_id, uint64_t value)
{
if (*index > 0)
props[*index - 1].base.next_extension = (uintptr_t)&props[*index];
@@ -187,6 +187,20 @@ oa_prop_set(struct drm_xe_ext_set_property *props, uint32_t *index,
*index = *index + 1;
}
static void
oa_prop_set(struct drm_xe_ext_set_property *props, uint32_t *index,
enum drm_xe_oa_property_id prop_id, uint64_t value)
{
xe_prop_set(props, index, (uint32_t)prop_id, value);
}
static void
eu_stall_prop_set(struct drm_xe_ext_set_property *props, uint32_t *index,
enum drm_xe_eu_stall_property_id prop_id, uint64_t value)
{
xe_prop_set(props, index, (uint32_t)prop_id, value);
}
int
xe_perf_stream_open(struct intel_perf_config *perf_config, int drm_fd,
uint32_t exec_id, uint64_t metrics_set_id,
@@ -417,9 +431,9 @@ xe_perf_eustall_stream_open(int drm_fd, uint32_t sample_rate,
int gt_id = first_rendering_gt_id(drm_fd);
assert(gt_id >= 0);
oa_prop_set(props, &i, DRM_XE_EU_STALL_PROP_SAMPLE_RATE, sample_rate);
oa_prop_set(props, &i, DRM_XE_EU_STALL_PROP_WAIT_NUM_REPORTS, min_event_count);
oa_prop_set(props, &i, DRM_XE_EU_STALL_PROP_GT_ID, gt_id);
eu_stall_prop_set(props, &i, DRM_XE_EU_STALL_PROP_SAMPLE_RATE, sample_rate);
eu_stall_prop_set(props, &i, DRM_XE_EU_STALL_PROP_WAIT_NUM_REPORTS, min_event_count);
eu_stall_prop_set(props, &i, DRM_XE_EU_STALL_PROP_GT_ID, gt_id);
fd = intel_ioctl(drm_fd, DRM_IOCTL_XE_OBSERVATION, &observation_param);
if (fd < 0)