projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ab8f42
)
drm/i915/irq: Uninstall should be called just once
author
Rodrigo Vivi
<rodrigo.vivi@intel.com>
Mon, 16 Sep 2024 16:19:37 +0000
(12:19 -0400)
committer
Rodrigo Vivi
<rodrigo.vivi@intel.com>
Tue, 17 Sep 2024 23:48:22 +0000
(19:48 -0400)
There shouldn't be any path where the irq uninstall is called
twice nowadays. So, remove the FIXME commend and change
the check to a WARN.
Suggested-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20240916161937.537334-1-rodrigo.vivi@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/i915/i915_irq.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/i915/i915_irq.c
b/drivers/gpu/drm/i915/i915_irq.c
index 723d1334fdbbc064e423527304dd99790a51ed09..a784803f709aea5fcb768028483278c99fb05b5e 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_irq.c
+++ b/
drivers/gpu/drm/i915/i915_irq.c
@@
-1422,13
+1422,7
@@
void intel_irq_uninstall(struct drm_i915_private *dev_priv)
{
int irq = to_pci_dev(dev_priv->drm.dev)->irq;
- /*
- * FIXME we can get called twice during driver probe
- * error handling as well as during driver remove due to
- * intel_display_driver_remove() calling us out of sequence.
- * Would be nice if it didn't do that...
- */
- if (!dev_priv->irqs_enabled)
+ if (drm_WARN_ON(&dev_priv->drm, !dev_priv->irqs_enabled))
return;
intel_irq_reset(dev_priv);