Skip to content

Commit

Permalink
drm/xe: Rely on kmalloc/kzalloc log message
Browse files Browse the repository at this point in the history
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: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
  • Loading branch information
Francois Dugast authored and Rodrigo Vivi committed Dec 21, 2023
1 parent 4d18eac commit 955c09e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
4 changes: 1 addition & 3 deletions drivers/gpu/drm/xe/xe_gt_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
local = drmm_kmalloc(&gt_to_xe(gt)->drm, DEBUGFS_SIZE, GFP_KERNEL);
if (!local) {
XE_WARN_ON("Couldn't allocate memory");
if (!local)
return;
}

memcpy(local, debugfs_list, DEBUGFS_SIZE);
#undef DEBUGFS_SIZE
Expand Down
4 changes: 1 addition & 3 deletions drivers/gpu/drm/xe/xe_guc_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
local = drmm_kmalloc(&guc_to_xe(guc)->drm, DEBUGFS_SIZE, GFP_KERNEL);
if (!local) {
XE_WARN_ON("Couldn't allocate memory");
if (!local)
return;
}

memcpy(local, debugfs_list, DEBUGFS_SIZE);
#undef DEBUGFS_SIZE
Expand Down
4 changes: 1 addition & 3 deletions drivers/gpu/drm/xe/xe_huc_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
local = drmm_kmalloc(&huc_to_xe(huc)->drm, DEBUGFS_SIZE, GFP_KERNEL);
if (!local) {
XE_WARN_ON("Couldn't allocate memory");
if (!local)
return;
}

memcpy(local, debugfs_list, DEBUGFS_SIZE);
#undef DEBUGFS_SIZE
Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/xe/xe_query.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static int query_engines(struct xe_device *xe,
}

hw_engine_info = kmalloc(size, GFP_KERNEL);
if (XE_IOCTL_DBG(xe, !hw_engine_info))
if (!hw_engine_info)
return -ENOMEM;

for_each_gt(gt, xe, gt_id)
Expand Down Expand Up @@ -182,7 +182,7 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query)
}

config = kzalloc(size, GFP_KERNEL);
if (XE_IOCTL_DBG(xe, !config))
if (!config)
return -ENOMEM;

config->num_params = num_params;
Expand Down Expand Up @@ -231,7 +231,7 @@ static int query_gts(struct xe_device *xe, struct drm_xe_device_query *query)
}

gts = kzalloc(size, GFP_KERNEL);
if (XE_IOCTL_DBG(xe, !gts))
if (!gts)
return -ENOMEM;

gts->num_gt = xe->info.gt_count;
Expand Down Expand Up @@ -278,7 +278,7 @@ static int query_hwconfig(struct xe_device *xe,
}

hwconfig = kzalloc(size, GFP_KERNEL);
if (XE_IOCTL_DBG(xe, !hwconfig))
if (!hwconfig)
return -ENOMEM;

xe_device_mem_access_get(xe);
Expand Down

0 comments on commit 955c09e

Please sign in to comment.