diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-10-21 16:14:42 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-10-21 23:20:40 +0300 |
| commit | a9922912881531f661c4402819bca8b53d01bbbd (patch) | |
| tree | e9ce65f4fbd3d9e9b27a80f4f941eb31e3a60e64 /drivers/gpu/drm | |
| parent | d08c4e2327428d93f6d80ab0e7a79679f4c32906 (diff) | |
drm/i915: Do gen5_gt_irq_postinstall() before enabling the master interrupt
Let's make sure the lower level interrupt bits are all lined
up before we flip on the master interrupt.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201021131443.25616-4-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index b753c77c9a77..82713d4a376e 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -3474,11 +3474,11 @@ static void ilk_irq_postinstall(struct drm_i915_private *dev_priv) ibx_irq_pre_postinstall(dev_priv); + gen5_gt_irq_postinstall(&dev_priv->gt); + GEN3_IRQ_INIT(uncore, DE, dev_priv->irq_mask, display_mask | extra_mask); - gen5_gt_irq_postinstall(&dev_priv->gt); - ilk_hpd_detection_setup(dev_priv); ibx_irq_postinstall(dev_priv); |