Commit 955c09e2 authored by Francois Dugast's avatar Francois Dugast Committed by Rodrigo Vivi

drm/xe: Rely on kmalloc/kzalloc log message

Those messages are unnecessary because a generic message is already
produced in case of allocation failure. Besides, this also removes a
misuse of the XE_IOCTL_DBG macro.
Signed-off-by: default avatarFrancois Dugast <francois.dugast@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 4d18eac0
...@@ -173,10 +173,8 @@ void xe_gt_debugfs_register(struct xe_gt *gt) ...@@ -173,10 +173,8 @@ void xe_gt_debugfs_register(struct xe_gt *gt)
*/ */
#define DEBUGFS_SIZE (ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list)) #define DEBUGFS_SIZE (ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list))
local = drmm_kmalloc(&gt_to_xe(gt)->drm, DEBUGFS_SIZE, GFP_KERNEL); local = drmm_kmalloc(&gt_to_xe(gt)->drm, DEBUGFS_SIZE, GFP_KERNEL);
if (!local) { if (!local)
XE_WARN_ON("Couldn't allocate memory");
return; return;
}
memcpy(local, debugfs_list, DEBUGFS_SIZE); memcpy(local, debugfs_list, DEBUGFS_SIZE);
#undef DEBUGFS_SIZE #undef DEBUGFS_SIZE
......
...@@ -89,10 +89,8 @@ void xe_guc_debugfs_register(struct xe_guc *guc, struct dentry *parent) ...@@ -89,10 +89,8 @@ void xe_guc_debugfs_register(struct xe_guc *guc, struct dentry *parent)
#define DEBUGFS_SIZE (ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list)) #define DEBUGFS_SIZE (ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list))
local = drmm_kmalloc(&guc_to_xe(guc)->drm, DEBUGFS_SIZE, GFP_KERNEL); local = drmm_kmalloc(&guc_to_xe(guc)->drm, DEBUGFS_SIZE, GFP_KERNEL);
if (!local) { if (!local)
XE_WARN_ON("Couldn't allocate memory");
return; return;
}
memcpy(local, debugfs_list, DEBUGFS_SIZE); memcpy(local, debugfs_list, DEBUGFS_SIZE);
#undef DEBUGFS_SIZE #undef DEBUGFS_SIZE
......
...@@ -55,10 +55,8 @@ void xe_huc_debugfs_register(struct xe_huc *huc, struct dentry *parent) ...@@ -55,10 +55,8 @@ void xe_huc_debugfs_register(struct xe_huc *huc, struct dentry *parent)
#define DEBUGFS_SIZE (ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list)) #define DEBUGFS_SIZE (ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list))
local = drmm_kmalloc(&huc_to_xe(huc)->drm, DEBUGFS_SIZE, GFP_KERNEL); local = drmm_kmalloc(&huc_to_xe(huc)->drm, DEBUGFS_SIZE, GFP_KERNEL);
if (!local) { if (!local)
XE_WARN_ON("Couldn't allocate memory");
return; return;
}
memcpy(local, debugfs_list, DEBUGFS_SIZE); memcpy(local, debugfs_list, DEBUGFS_SIZE);
#undef DEBUGFS_SIZE #undef DEBUGFS_SIZE
......
...@@ -65,7 +65,7 @@ static int query_engines(struct xe_device *xe, ...@@ -65,7 +65,7 @@ static int query_engines(struct xe_device *xe,
} }
hw_engine_info = kmalloc(size, GFP_KERNEL); hw_engine_info = kmalloc(size, GFP_KERNEL);
if (XE_IOCTL_DBG(xe, !hw_engine_info)) if (!hw_engine_info)
return -ENOMEM; return -ENOMEM;
for_each_gt(gt, xe, gt_id) for_each_gt(gt, xe, gt_id)
...@@ -182,7 +182,7 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query) ...@@ -182,7 +182,7 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query)
} }
config = kzalloc(size, GFP_KERNEL); config = kzalloc(size, GFP_KERNEL);
if (XE_IOCTL_DBG(xe, !config)) if (!config)
return -ENOMEM; return -ENOMEM;
config->num_params = num_params; config->num_params = num_params;
...@@ -231,7 +231,7 @@ static int query_gts(struct xe_device *xe, struct drm_xe_device_query *query) ...@@ -231,7 +231,7 @@ static int query_gts(struct xe_device *xe, struct drm_xe_device_query *query)
} }
gts = kzalloc(size, GFP_KERNEL); gts = kzalloc(size, GFP_KERNEL);
if (XE_IOCTL_DBG(xe, !gts)) if (!gts)
return -ENOMEM; return -ENOMEM;
gts->num_gt = xe->info.gt_count; gts->num_gt = xe->info.gt_count;
...@@ -278,7 +278,7 @@ static int query_hwconfig(struct xe_device *xe, ...@@ -278,7 +278,7 @@ static int query_hwconfig(struct xe_device *xe,
} }
hwconfig = kzalloc(size, GFP_KERNEL); hwconfig = kzalloc(size, GFP_KERNEL);
if (XE_IOCTL_DBG(xe, !hwconfig)) if (!hwconfig)
return -ENOMEM; return -ENOMEM;
xe_device_mem_access_get(xe); xe_device_mem_access_get(xe);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment