diff options
| author | Francois Dugast <francois.dugast@intel.com> | 2023-07-19 13:20:59 +0000 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-21 11:37:51 -0500 |
| commit | 955c09e2cc4894b5997f548de1bd3bdfa18e60e4 (patch) | |
| tree | 10cee0ec2b5f694f4b98cf611b9f95cdcea79454 /drivers/gpu | |
| parent | 4d18eac03212fc2d8c3d9715e2261ac50e989403 (diff) | |
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: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_gt_debugfs.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_debugfs.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_huc_debugfs.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_query.c | 8 |
4 files changed, 7 insertions, 13 deletions
diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c index f9f653243f20..e622174a866d 100644 --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c @@ -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(>_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 diff --git a/drivers/gpu/drm/xe/xe_guc_debugfs.c b/drivers/gpu/drm/xe/xe_guc_debugfs.c index 0178b1a2d367..b43c70de7e37 100644 --- a/drivers/gpu/drm/xe/xe_guc_debugfs.c +++ b/drivers/gpu/drm/xe/xe_guc_debugfs.c @@ -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 diff --git a/drivers/gpu/drm/xe/xe_huc_debugfs.c b/drivers/gpu/drm/xe/xe_huc_debugfs.c index ae3c21315d59..18585a7eeb9d 100644 --- a/drivers/gpu/drm/xe/xe_huc_debugfs.c +++ b/drivers/gpu/drm/xe/xe_huc_debugfs.c @@ -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 diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c index 4b7869596ba8..f880c9af1651 100644 --- a/drivers/gpu/drm/xe/xe_query.c +++ b/drivers/gpu/drm/xe/xe_query.c @@ -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) @@ -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; @@ -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; @@ -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); |