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 52820CC6B2A for ; Sat, 17 Oct 2026 03:50:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D312C10E345; Sat, 17 Oct 2026 03:49:56 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4D30010E31D for ; Sat, 17 Oct 2026 03:49:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1792208989; x=1823744989; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eZwww6RixpMJKg7J7PCoslcbQd2wEKTr1aQVWb3P1Ys=; b=QTqh+UVfqHZnAUtmfAE5JOHpLCAQ1yqhndt9pD4iruO9ZdE/YYt6qj8x 8XTEpUvvfH6umH0O8O41ohpMWRRGb6wDW4CUATvlnk1F8+h1Txi4zGHle XhlsommRNG/CMpcAg7HaJwEbPfQ2w1W/KBKcMXuYZe0b1nUDiWk9Iudvw KmQhysxZVQjelEJmQ/+dLOD1jm1BNS7aOte448ffq9reO8BkrYI693zgw HI/m9suih78Mh3z+Ul7IXDVNrMSFJZRWFrFTvWQHTa/GHDUGSbZ0/M0ZQ 31USxfPDShWRO0dy4fgJSIaMSLcrRcn9sgENgUoSy+HOfqCu1biPv4lpc w==; X-CSE-ConnectionGUID: oyOpkfemRVWvwUqDtZvAtQ== X-CSE-MsgGUID: 8iOhJVHpRzGMdThL8ANLsw== X-IronPort-AV: E=McAfee;i="6800,10657,11937"; a="1011719" X-IronPort-AV: E=Sophos;i="6.27,163,1787036400"; d="scan'208";a="1011719" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2026 20:49:49 -0700 X-CSE-ConnectionGUID: z+ZWWIpZRvus/UvtTCv7fQ== X-CSE-MsgGUID: 0hCTV1akRQ2Zritp5xdNnw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,163,1787036400"; d="scan'208";a="2154358" Received: from jraag-z790m-itx-wifi.iind.intel.com ([10.190.239.23]) by fmviesa003.fm.intel.com with ESMTP; 16 Oct 2026 20:49:46 -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 v11 4/9] drm/xe: Move xe_device_wedged_fini() registration to xe_device_probe_early() Date: Sat, 17 Oct 2026 09:17:41 +0530 Message-ID: <20261017034842.67054-5-raag.jadav@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261017034842.67054-1-raag.jadav@intel.com> References: <20261017034842.67054-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 cf0235e57827..b185c7d33185 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() */ @@ -1099,10 +1105,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