]> git.dujemihanovic.xyz Git - linux.git/commitdiff
drm/xe/snapshot: Remove drm_err on guc alloc failures
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 21 Feb 2024 13:30:16 +0000 (14:30 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 21 Feb 2024 19:08:19 +0000 (20:08 +0100)
The kernel will complain loudly if allocation fails, no need to do it
ourselves.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Francois Dugast <francois.dugast@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240221133024.898315-1-maarten.lankhorst@linux.intel.com
drivers/gpu/drm/xe/xe_guc_submit.c

index 3ac51162cfa723f0aaaf205c9f0429e3111e8d6d..ff77bc8da1b27052debc63e06945dc55bd23f100 100644 (file)
@@ -1794,18 +1794,14 @@ struct xe_guc_submit_exec_queue_snapshot *
 xe_guc_exec_queue_snapshot_capture(struct xe_sched_job *job)
 {
        struct xe_exec_queue *q = job->q;
-       struct xe_guc *guc = exec_queue_to_guc(q);
-       struct xe_device *xe = guc_to_xe(guc);
        struct xe_gpu_scheduler *sched = &q->guc->sched;
        struct xe_guc_submit_exec_queue_snapshot *snapshot;
        int i;
 
        snapshot = kzalloc(sizeof(*snapshot), GFP_ATOMIC);
 
-       if (!snapshot) {
-               drm_err(&xe->drm, "Skipping GuC Engine snapshot entirely.\n");
+       if (!snapshot)
                return NULL;
-       }
 
        snapshot->guc.id = q->guc->id;
        memcpy(&snapshot->name, &q->name, sizeof(snapshot->name));
@@ -1821,9 +1817,7 @@ xe_guc_exec_queue_snapshot_capture(struct xe_sched_job *job)
        snapshot->lrc = kmalloc_array(q->width, sizeof(struct lrc_snapshot),
                                      GFP_ATOMIC);
 
-       if (!snapshot->lrc) {
-               drm_err(&xe->drm, "Skipping GuC Engine LRC snapshot.\n");
-       } else {
+       if (snapshot->lrc) {
                for (i = 0; i < q->width; ++i) {
                        struct xe_lrc *lrc = q->lrc + i;
 
@@ -1851,9 +1845,7 @@ xe_guc_exec_queue_snapshot_capture(struct xe_sched_job *job)
                                               sizeof(struct pending_list_snapshot),
                                               GFP_ATOMIC);
 
-       if (!snapshot->pending_list) {
-               drm_err(&xe->drm, "Skipping GuC Engine pending_list snapshot.\n");
-       } else {
+       if (snapshot->pending_list) {
                struct xe_sched_job *job_iter;
 
                i = 0;