Re: [PATCH 5/6] drm/{i915, xe}: move opregion cleanup to intel_display_driver_remove_nogem()

[Michał Grzelak]

On Mon, 15 Jun 2026, Jani Nikula wrote:

The intel_opregion_cleanup() call should really be in display. Move it
at the end of intel_display_driver_probe_noirq().

For xe, this is a completely non-functional change now that the
noirq/nogem cleanup calls are in the right order.

For i915, this only changes the relative order of
intel_opregion_cleanup() and i915_perf_fini(), which should be of no
consequence.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>

Reviewed-by: Michał Grzelak <michal.grze...@intel.com>

BR,
Michał

---
drivers/gpu/drm/i915/display/intel_display_driver.c | 2 ++
drivers/gpu/drm/i915/i915_driver.c                  | 3 ---
drivers/gpu/drm/xe/display/xe_display.c             | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c 
b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 15a61f171d73..a1c91fbf737c 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -662,6 +662,8 @@ void intel_display_driver_remove_nogem(struct intel_display 
*display)
        intel_display_power_driver_remove(display);

        intel_bios_driver_remove(display);
+
+       intel_opregion_cleanup(display);
}

void intel_display_driver_unregister(struct intel_display *display)
diff --git a/drivers/gpu/drm/i915/i915_driver.c 
b/drivers/gpu/drm/i915/i915_driver.c
index 05fdcba7b2dc..68ab96b8195b 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -586,13 +586,10 @@ ALLOW_ERROR_INJECTION(i915_driver_hw_probe, ERRNO);
 */
static void i915_driver_hw_remove(struct drm_i915_private *dev_priv)
{
-       struct intel_display *display = dev_priv->display;
        struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);

        i915_perf_fini(dev_priv);

-       intel_opregion_cleanup(display);
-
        pci_disable_msi(pdev);
}

diff --git a/drivers/gpu/drm/xe/display/xe_display.c 
b/drivers/gpu/drm/xe/display/xe_display.c
index 0d93784754c1..8be3e600838b 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -84,7 +84,6 @@ static void xe_display_fini_early(void *arg)
        intel_hpd_cancel_work(display);
        intel_display_driver_remove_noirq(display);
        intel_display_driver_remove_nogem(display);
-       intel_opregion_cleanup(display);
        intel_display_power_cleanup(display);
}

--
2.47.3