The uAPI provides queries which return arrays of elements. As of now the format used in the struct is different depending on which element is queried. Fix this for memory regions by applying the pattern below: struct drm_xe_query_Xs { __u32 num_Xs; struct drm_xe_X Xs[]; ... } This removes "query" in the name of struct drm_xe_query_mem_region as it is not returned from the query IOCTL. There is no functional change. v2: Only rename drm_xe_query_mem_region to drm_xe_mem_region (José Roberto de Souza) v3: Rename usage to mem_regions in xe_query.c (José Roberto de Souza)
Showing the changes to include/uapi (1 of 2 files). Show all
Unified · Split
| @@ -183,10 +183,10 @@ enum drm_xe_memory_class { · 182 unmodified lines | ||
| 183 | 183 | }; |
| 184 | 184 | |
| 185 | 185 | /** |
| 186 | − * struct drm_xe_query_mem_region - Describes some region as known to | |
| 186 | + * struct drm_xe_mem_region - Describes some region as known to | |
| 187 | 187 | * the driver. |
| 188 | 188 | */ |
| 189 | −struct drm_xe_query_mem_region { | |
| 189 | +struct drm_xe_mem_region { | |
| 190 | 190 | /** |
| 191 | 191 | * @mem_class: The memory class describing this region. |
| 192 | 192 | * |
| @@ -323,12 +323,12 @@ struct drm_xe_query_engine_cycles { · 130 unmodified lines | ||
| 323 | 323 | * struct drm_xe_query_mem_regions in .data. |
| 324 | 324 | */ |
| 325 | 325 | struct drm_xe_query_mem_regions { |
| 326 | − /** @num_regions: number of memory regions returned in @regions */ | |
| 327 | − __u32 num_regions; | |
| 326 | + /** @num_mem_regions: number of memory regions returned in @mem_regions */ | |
| 327 | + __u32 num_mem_regions; | |
| 328 | 328 | /** @pad: MBZ */ |
| 329 | 329 | __u32 pad; |
| 330 | − /** @regions: The returned regions for this device */ | |
| 331 | − struct drm_xe_query_mem_region regions[]; | |
| 330 | + /** @mem_regions: The returned memory regions for this device */ | |
| 331 | + struct drm_xe_mem_region mem_regions[]; | |
| 332 | 332 | }; |
| 333 | 333 | |
| 334 | 334 | /** |