Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 70343CA9EBE for ; Sat, 10 Oct 2026 09:08:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 10DE810E5A5; Sat, 10 Oct 2026 09:08:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="lpKkGh1k"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 51D7010E5A5 for ; Sat, 10 Oct 2026 09:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1791623309; x=1823159309; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XUJHsV8zKwPq9KyP2BfYs82YMoiE96qIYFe1KAn+WP0=; b=lpKkGh1kbQFWSYVvEQ+CH5243oHpzENlroS5vA5nuqvBrTS7YNcCrUat jYWeARCG7czimam4ACQ2Dgyl5NHUfqN/sKPSvIsNP0QR/WmX8Q8XbZL3O vfI9tI39M9VdwhAG1jcTmCYcxc3e/5oUDllXA+i/BM5O4pMwN1gnmbojU S3UDkGDMmVwAJHTQiAeUD5b+3vedXYbHkV4/bw9aWf906kchB7BUpMAPj gsrNfcKGxhOD/KqSyNrbmeGXHwWbmFh3+19Fr8AKCOWVeOU41le/ZQ6Pf IA+HXQthA6bdtGYvTaF+zHC0Ll6PeLA3A6f97+HYmt+XKkWLtgIo6haBB w==; X-CSE-ConnectionGUID: vzIrroZuRpeKJHs5q/6DFA== X-CSE-MsgGUID: eMzGT6FxQ7qoMnsi4Y0HMg== X-IronPort-AV: E=McAfee;i="6800,10657,11930"; a="290827" X-IronPort-AV: E=Sophos;i="6.27,150,1787036400"; d="scan'208";a="290827" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2026 02:08:28 -0700 X-CSE-ConnectionGUID: Vh6gbENTQCiqB/1Lz9M6Gg== X-CSE-MsgGUID: Rfrf6nywST2ZOCI7e8Qpzw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,150,1787036400"; d="scan'208";a="427729" Received: from jraag-z790m-itx-wifi.iind.intel.com ([10.190.239.23]) by orviesa009.jf.intel.com with ESMTP; 10 Oct 2026 02:08:27 -0700 From: Raag Jadav To: intel-xe@lists.freedesktop.org Cc: riana.tauro@intel.com, michal.wajdeczko@intel.com, lukasz.laguna@intel.com, matthew.d.roper@intel.com, matthew.brost@intel.com, mallesh.koujalagi@intel.com, rodrigo.vivi@intel.com, Raag Jadav Subject: [PATCH v4 2/5] drm/xe: Move xe_device_wedged_fini() registration to xe_device_probe_early() Date: Sat, 10 Oct 2026 14:36:19 +0530 Message-ID: <20261010090718.68308-3-raag.jadav@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261010090718.68308-1-raag.jadav@intel.com> References: <20261010090718.68308-1-raag.jadav@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" The device can be declared wedged while processing boot-time hardware errors, which can result in PM reference leak if driver probe fails before xe_device_wedged_fini() is registered. Early register the required cleanup action and fix this. Fixes: a7df563b45b0 ("drm/xe/xe_hw_error: Handle CSC Firmware reported Hardware errors") Signed-off-by: Raag Jadav Reviewed-by: Rodrigo Vivi --- v2: Split fixes into separate patches (Rodrigo, Michal) --- drivers/gpu/drm/xe/xe_device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 22ae10958d7f..6ae1da578bda 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -697,6 +697,8 @@ static int xe_device_vram_alloc(struct xe_device *xe) return 0; } +static void xe_device_wedged_fini(struct drm_device *drm, void *arg); + /** * xe_device_probe_early: Device early probe * @xe: xe device instance @@ -765,6 +767,10 @@ int xe_device_probe_early(struct xe_device *xe) if (err) return err; + err = drmm_add_action_or_reset(&xe->drm, xe_device_wedged_fini, xe); + if (err) + return err; + return 0; } ALLOW_ERROR_INJECTION(xe_device_probe_early, ERRNO); /* See xe_pci_probe() */ @@ -1095,10 +1101,6 @@ int xe_device_probe(struct xe_device *xe) detect_preproduction_hw(xe); - err = drmm_add_action_or_reset(&xe->drm, xe_device_wedged_fini, xe); - if (err) - goto err_unregister_display; - /* * Process and log any errors detected by hardware. Possible results can * include declaring the device as wedged, which must be done only after -- 2.43.0