From b47b0ef1ba34e351228b57ce7ba74efc6d7b2c24 Mon Sep 17 00:00:00 2001 From: Matthew Auld Date: Wed, 15 Feb 2023 10:28:45 +0000 Subject: drm/xe/query: zero the region info There are also some reserved fields in here which are not currently cleared when handing back to userspace. Otherwise we might run into issues if we later wish to use them. Signed-off-by: Matthew Auld Reviewed-by: Lucas De Marchi lucas.demarchi@intel.com Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_query.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c index 6e904e97f456..f9f21bd1bfd7 100644 --- a/drivers/gpu/drm/xe/xe_query.c +++ b/drivers/gpu/drm/xe/xe_query.c @@ -115,16 +115,13 @@ static int query_memory_usage(struct xe_device *xe, return -EINVAL; } - usage = kmalloc(size, GFP_KERNEL); + usage = kzalloc(size, GFP_KERNEL); if (XE_IOCTL_ERR(xe, !usage)) return -ENOMEM; - usage->pad = 0; - man = ttm_manager_type(&xe->ttm, XE_PL_TT); usage->regions[0].mem_class = XE_MEM_REGION_CLASS_SYSMEM; usage->regions[0].instance = 0; - usage->regions[0].pad = 0; usage->regions[0].min_page_size = PAGE_SIZE; usage->regions[0].max_page_size = PAGE_SIZE; usage->regions[0].total_size = man->size << PAGE_SHIFT; @@ -138,7 +135,6 @@ static int query_memory_usage(struct xe_device *xe, XE_MEM_REGION_CLASS_VRAM; usage->regions[usage->num_regions].instance = usage->num_regions; - usage->regions[usage->num_regions].pad = 0; usage->regions[usage->num_regions].min_page_size = xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : PAGE_SIZE; -- cgit v1.2.3