OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/perf: fix querying of configurations

Browse Source 
Using the unsized data field is incorrect. The data is located behind
the entire drm_i915_query_perf_config structure.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: mesa-stable
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26285>
This commit is contained in:
Lionel Landwerlin
2023-11-20 11:43:24 +02:00
committed by Marge Bot
parent 46c9128117
commit f9bab3566b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/intel/perf/intel_perf.c
View File

@@ -280,18 +280,19 @@ i915_query_perf_config_data(struct intel_perf_config *perf,
{
char data[sizeof(struct drm_i915_query_perf_config) +
sizeof(struct drm_i915_perf_oa_config)] = {};
struct drm_i915_query_perf_config *query = (void *)data;
struct drm_i915_query_perf_config *i915_query = (void *)data;
struct drm_i915_perf_oa_config *i915_config = (void *)data + sizeof(*i915_query);
memcpy(query->uuid, guid, sizeof(query->uuid));
memcpy(query->data, config, sizeof(*config));
memcpy(i915_query->uuid, guid, sizeof(i915_query->uuid));
memcpy(i915_config, config, sizeof(*config));
int32_t item_length = sizeof(data);
if (intel_i915_query_flags(fd, DRM_I915_QUERY_PERF_CONFIG,
DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_UUID,
query, &item_length))
i915_query, &item_length))
return false;
memcpy(config, query->data, sizeof(*config));
memcpy(config, i915_config, sizeof(*config));
return true;
}