Re: [PATCH 6/6] drm/{i915, xe}: move intel_hpd_cancel_work() to intel_display_driver_remove_noirq()

[Michał Grzelak]

On Mon, 15 Jun 2026, Jani Nikula wrote:

intel_hpd_cancel_work() gets called before
intel_display_driver_remove_noirq(). Move it there.

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                  | 1 -
drivers/gpu/drm/xe/display/xe_display.c             | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c 
b/drivers/gpu/drm/i915/display/intel_display_driver.c
index a1c91fbf737c..bb5301b90231 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -622,6 +622,8 @@ void intel_display_driver_remove_noirq(struct intel_display 
*display)
        if (!HAS_DISPLAY(display))
                return;

+       intel_hpd_cancel_work(display);
+
        intel_display_driver_suspend_access(display);

        /*
diff --git a/drivers/gpu/drm/i915/i915_driver.c 
b/drivers/gpu/drm/i915/i915_driver.c
index 68ab96b8195b..3ac7dc66085f 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -948,7 +948,6 @@ void i915_driver_remove(struct drm_i915_private *i915)
        intel_display_driver_remove(display);

        intel_irq_uninstall(i915);
-       intel_hpd_cancel_work(display);

        intel_display_driver_remove_noirq(display);

diff --git a/drivers/gpu/drm/xe/display/xe_display.c 
b/drivers/gpu/drm/xe/display/xe_display.c
index 8be3e600838b..92a4573db28a 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -81,7 +81,6 @@ static void xe_display_fini_early(void *arg)
        if (!xe->info.probe_display)
                return;

-       intel_hpd_cancel_work(display);
        intel_display_driver_remove_noirq(display);
        intel_display_driver_remove_nogem(display);
        intel_display_power_cleanup(display);
--
2.47.3