]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/xe/uc: Don't emit false error if running in execlist mode
authorMichal Wajdeczko <michal.wajdeczko@intel.com>
Tue, 21 May 2024 11:48:57 +0000 (13:48 +0200)
committerMichal Wajdeczko <michal.wajdeczko@intel.com>
Wed, 22 May 2024 16:26:22 +0000 (18:26 +0200)
When running in execlist mode (using force_execlist=1 modparam)
we incorrectly select the error path in xe_uc_init(), leading to
an unwanted error message like this:

[ ] xe 0000:00:00.0: [drm] *ERROR* GT0: Failed to initialize uC (0000000000000000)

Fix that by doing early return like we do in other similar cases.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240521114857.712-1-michal.wajdeczko@intel.com
drivers/gpu/drm/xe/xe_uc.c

index 0186eafc947dbd2ede219f646257c6d5a6d9bfe7..85808706d1c85dbf933502bfdf73d7586988c0fc 100644 (file)
@@ -51,7 +51,7 @@ int xe_uc_init(struct xe_uc *uc)
                goto err;
 
        if (!xe_device_uc_enabled(uc_to_xe(uc)))
-               goto err;
+               return 0;
 
        ret = xe_wopcm_init(&uc->wopcm);
        if (ret)