Now that all of the sleeping work is done outside of the IRQ, we can
convert it to a hard IRQ. Shared IRQs may be triggered even after
calling disable_irq, so use free_irq instead which removes our callback
altogether.

Signed-off-by: Sean Anderson <sean.ander...@linux.dev>
---

Changes in v6:
- Fix hang upon driver removal

Changes in v3:
- New

 drivers/gpu/drm/xlnx/zynqmp_dp.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c
index cec5711c7026..532e103713b3 100644
--- a/drivers/gpu/drm/xlnx/zynqmp_dp.c
+++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c
@@ -1831,9 +1831,8 @@ int zynqmp_dp_probe(struct zynqmp_dpsub *dpsub)
         * Now that the hardware is initialized and won't generate spurious
         * interrupts, request the IRQ.
         */
-       ret = devm_request_threaded_irq(dp->dev, dp->irq, NULL,
-                                       zynqmp_dp_irq_handler, IRQF_ONESHOT,
-                                       dev_name(dp->dev), dp);
+       ret = devm_request_irq(dp->dev, dp->irq, zynqmp_dp_irq_handler,
+                              IRQF_SHARED, dev_name(dp->dev), dp);
        if (ret < 0)
                goto err_phy_exit;
 
@@ -1858,7 +1857,7 @@ void zynqmp_dp_remove(struct zynqmp_dpsub *dpsub)
        struct zynqmp_dp *dp = dpsub->dp;
 
        zynqmp_dp_write(dp, ZYNQMP_DP_INT_DS, ZYNQMP_DP_INT_ALL);
-       disable_irq(dp->irq);
+       devm_free_irq(dp->dev, dp->irq, dp);
 
        cancel_work_sync(&dp->hpd_irq_work);
        cancel_work_sync(&dp->hpd_work);
-- 
2.35.1.1320.gc452695387.dirty

Reply via email to