[PATCH 03/12] drm/xe: Use devm aperture helpers for sysfb restore on probe failure

Zack Rusin
2025-12-29T21:59:24Z

Use devm_aperture_remove_conflicting_pci_devices() instead of the
non-devm variant to automatically restore the system framebuffer
(efifb/simpledrm) if the driver's probe fails after removing the
firmware framebuffer.

Call devm_aperture_remove_conflicting_pci_devices_done() after
successful probe to cancel the automatic restore, as the driver
is now responsible for display output.

Signed-off-by: Zack Rusin <zack.rusin@broadcom.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: David Airlie <airlied@gmail.com>
Cc: Simona Vetter <simona@ffwll.ch>
Cc: intel-xe@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
---
drivers/gpu/drm/xe/xe_device.c | 7 ++++++-
drivers/gpu/drm/xe/xe_pci.c | 7 +++++++
2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index c7d373c70f0f..ee9ae73222d9 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -428,7 +428,12 @@ struct xe_device *xe_device_create(struct pci_dev *pdev,

xe_display_driver_set_hooks(&driver);

- err = aperture_remove_conflicting_pci_devices(pdev, driver.name);
+ /*
+ * Use devm variant to automatically restore sysfb if probe fails.
+ * This ensures the user doesn't lose display if our probe fails
+ * after removing the firmware framebuffer (efifb/simpledrm).
+ */
+ err = devm_aperture_remove_conflicting_pci_devices(pdev, driver.name);
if (err)
return ERR_PTR(err);

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 9c9ea10d994c..ee08a09fda6a 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -6,6 +6,7 @@
#include "xe_pci.h"

#include <kunit/static_stub.h>
+#include <linux/aperture.h>
#include <linux/device/driver.h>
#include <linux/module.h>
#include <linux/pci.h>
@@ -1058,6 +1059,12 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
drm_dbg(&xe->drm, "d3cold: capable=%s\n",
str_yes_no(xe->d3cold.capable));

+ /*
+ * Probe succeeded - cancel the automatic sysfb restore action.
+ * We're now responsible for display output.
+ */
+ devm_aperture_remove_conflicting_pci_devices_done(pdev);
+
return 0;

err_driver_cleanup:
--
2.48.1