Skip to contentSkip to conversation

drm/i915: add hotplug activation period to hotplug update mask

PATCH In review Jani Nikula 4 participants 8 messages Oct 21, 2015 – Oct 22, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: add hotplug activation period to hotplug update mask

commit 0706f17c307b056ff6f1848320ba82d76945a6ff

Author: Egbert Eich <[email protected]>
Date:   Wed Sep 23 16:15:27 2015 +0200

drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2

added a check with WARN to ensure only bits within the mask are enabled. Turns out that doesn't hold for G4X, which spits out:

[    2.641439] ------------[ cut here ]------------
[    2.641444] WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/i915/i915_irq.c:182 i915_hotplug_interrupt_update_locked+0x45/0x83()
[    2.641446] WARN_ON(bits & ~mask)

etc.

Add CRT_HOTPLUG_ACTIVATION_PERIOD_64 to the mask to fix the warning.

References: https://bugzilla.kernel.org/show_bug.cgi?id=104991

Fixes 0706f17c307b ("drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2")
Cc Egbert Eich <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +4 -3
index 7f91f74961f4..5b9f63d4318b 100644
@@ -4236,9 +4236,10 @@ static void i915_hpd_irq_setup(struct drm_device *dev)
 
 	/* Ignore TV since it's buggy */
 	i915_hotplug_interrupt_update_locked(dev_priv,
-				      (HOTPLUG_INT_EN_MASK
-				       | CRT_HOTPLUG_VOLTAGE_COMPARE_MASK),
-				      hotplug_en);
+					     HOTPLUG_INT_EN_MASK |
+					     CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
+					     CRT_HOTPLUG_ACTIVATION_PERIOD_64,
+					     hotplug_en);
 }
 
 static irqreturn_t i965_irq_handler(int irq, void *arg)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 31 lines · Jani Nikula

commit 0706f17c307b056ff6f1848320ba82d76945a6ff

Author: Egbert Eich <[email protected]>
Date:   Wed Sep 23 16:15:27 2015 +0200

drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2

added a check with WARN to ensure only bits within the mask are enabled. Turns out that doesn't hold for G4X, which spits out:

[    2.641439] ------------[ cut here ]------------
[    2.641444] WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/i915/i915_irq.c:182 i915_hotplug_interrupt_update_locked+0x45/0x83()
[    2.641446] WARN_ON(bits & ~mask)

etc.

Add CRT_HOTPLUG_ACTIVATION_PERIOD_64 to the mask to fix the warning.

References: https://bugzilla.kernel.org/show_bug.cgi?id=104991

Fixes 0706f17c307b ("drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2")
Cc Egbert Eich <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +0 -0
index 7f91f74961f4..5b9f63d4318b 100644

drivers/gpu/drm/i915/i915_irq.c static void i915_hpd_irq_setup(struct drm_device *dev) · line 4242

Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +4 -3
@@ -4236,9 +4236,10 @@ static void i915_hpd_irq_setup(struct drm_device *dev)
 
 	/* Ignore TV since it's buggy */
 	i915_hotplug_interrupt_update_locked(dev_priv,
-				      (HOTPLUG_INT_EN_MASK
-				       | CRT_HOTPLUG_VOLTAGE_COMPARE_MASK),
-				      hotplug_en);
+					     HOTPLUG_INT_EN_MASK |
+					     CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
+					     CRT_HOTPLUG_ACTIVATION_PERIOD_64,
+					     hotplug_en);

Or maybe just ~CRT_HOTPLUG_FORCE_DETECT ?

Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +0 -0
 }
 
 static irqreturn_t i965_irq_handler(int irq, void *arg)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 33 lines · Ville Syrjälä
Quoted 32 lines · Jani Nikula

commit 0706f17c307b056ff6f1848320ba82d76945a6ff

Author: Egbert Eich <[email protected]>
Date:   Wed Sep 23 16:15:27 2015 +0200

drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2

added a check with WARN to ensure only bits within the mask are enabled. Turns out that doesn't hold for G4X, which spits out:

[    2.641439] ------------[ cut here ]------------
[    2.641444] WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/i915/i915_irq.c:182 i915_hotplug_interrupt_update_locked+0x45/0x83()
[    2.641446] WARN_ON(bits & ~mask)

etc.

Add CRT_HOTPLUG_ACTIVATION_PERIOD_64 to the mask to fix the warning.

References: https://bugzilla.kernel.org/show_bug.cgi?id=104991

Fixes 0706f17c307b ("drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2")
Cc Egbert Eich <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +0 -0
index 7f91f74961f4..5b9f63d4318b 100644
@@ -4236,9 +4236,10 @@ static void i915_hpd_irq_setup(struct drm_device *dev)
 
Quoted 11 lines

drivers/gpu/drm/i915/i915_irq.c static void i915_hpd_irq_setup(struct drm_device *dev) · line 4242

Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +4 -3
 	/* Ignore TV since it's buggy */
 	i915_hotplug_interrupt_update_locked(dev_priv,
-				      (HOTPLUG_INT_EN_MASK
-				       | CRT_HOTPLUG_VOLTAGE_COMPARE_MASK),
-				      hotplug_en);
+					     HOTPLUG_INT_EN_MASK |
+					     CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
+					     CRT_HOTPLUG_ACTIVATION_PERIOD_64,
+					     hotplug_en);

Or maybe just ~CRT_HOTPLUG_FORCE_DETECT ?

This patch already potentially changes behaviour by explicitly setting the activation period to zero (CRT_HOTPLUG_ACTIVATION_PERIOD_32) on non-g4x. Previously it was "don't care". Call me coward, but I am not comfortable with setting the rest of the bits to zero, at least not in the context of this fix, and risking regressions on old machines.

BR,
Jani.

Quoted 15 lines
Quoted 11 lines
drivers/gpu/drm/i915/i915_irq.c +0 -0
 }
 
 static irqreturn_t i965_irq_handler(int irq, void *arg)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä
Intel OTC
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by
#3 lore raw
Quoted 46 lines · Jani Nikula
Quoted 33 lines · Ville Syrjälä
Quoted 32 lines · Jani Nikula

commit 0706f17c307b056ff6f1848320ba82d76945a6ff

Author: Egbert Eich <[email protected]>
Date:   Wed Sep 23 16:15:27 2015 +0200

drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2

added a check with WARN to ensure only bits within the mask are enabled. Turns out that doesn't hold for G4X, which spits out:

[    2.641439] ------------[ cut here ]------------
[    2.641444] WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/i915/i915_irq.c:182 i915_hotplug_interrupt_update_locked+0x45/0x83()
[    2.641446] WARN_ON(bits & ~mask)

etc.

Add CRT_HOTPLUG_ACTIVATION_PERIOD_64 to the mask to fix the warning.

References: https://bugzilla.kernel.org/show_bug.cgi?id=104991

Fixes 0706f17c307b ("drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2")
Cc Egbert Eich <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +0 -0
index 7f91f74961f4..5b9f63d4318b 100644
@@ -4236,9 +4236,10 @@ static void i915_hpd_irq_setup(struct drm_device *dev)
 
Quoted 11 lines

drivers/gpu/drm/i915/i915_irq.c static void i915_hpd_irq_setup(struct drm_device *dev) · line 4242

Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +4 -3
 	/* Ignore TV since it's buggy */
 	i915_hotplug_interrupt_update_locked(dev_priv,
-				      (HOTPLUG_INT_EN_MASK
-				       | CRT_HOTPLUG_VOLTAGE_COMPARE_MASK),
-				      hotplug_en);
+					     HOTPLUG_INT_EN_MASK |
+					     CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
+					     CRT_HOTPLUG_ACTIVATION_PERIOD_64,
+					     hotplug_en);

Or maybe just ~CRT_HOTPLUG_FORCE_DETECT ?

Quoted 5 lines

This patch already potentially changes behaviour by explicitly setting the activation period to zero (CRT_HOTPLUG_ACTIVATION_PERIOD_32) on non-g4x. Previously it was "don't care". Call me coward, but I am not comfortable with setting the rest of the bits to zero, at least not in the context of this fix, and risking regressions on old machines.

Might be a notch too paranoid, but we've always had that rmw in there.

Quoted 23 lines

BR,
Jani.

Quoted 15 lines
Quoted 11 lines
drivers/gpu/drm/i915/i915_irq.c +0 -0
 }
 
 static irqreturn_t i965_irq_handler(int irq, void *arg)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä
Intel OTC
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author Applied
#4 lore raw
Quoted 53 lines · Daniel Vetter
Quoted 46 lines · Jani Nikula
Quoted 33 lines · Ville Syrjälä
Quoted 32 lines · Jani Nikula

commit 0706f17c307b056ff6f1848320ba82d76945a6ff

Author: Egbert Eich <[email protected]>
Date:   Wed Sep 23 16:15:27 2015 +0200

drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2

added a check with WARN to ensure only bits within the mask are enabled. Turns out that doesn't hold for G4X, which spits out:

[    2.641439] ------------[ cut here ]------------
[    2.641444] WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/i915/i915_irq.c:182 i915_hotplug_interrupt_update_locked+0x45/0x83()
[    2.641446] WARN_ON(bits & ~mask)

etc.

Add CRT_HOTPLUG_ACTIVATION_PERIOD_64 to the mask to fix the warning.

References: https://bugzilla.kernel.org/show_bug.cgi?id=104991

Fixes 0706f17c307b ("drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2")
Cc Egbert Eich <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +0 -0
index 7f91f74961f4..5b9f63d4318b 100644
@@ -4236,9 +4236,10 @@ static void i915_hpd_irq_setup(struct drm_device *dev)
 
Quoted 11 lines

drivers/gpu/drm/i915/i915_irq.c static void i915_hpd_irq_setup(struct drm_device *dev) · line 4242

Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +4 -3
 	/* Ignore TV since it's buggy */
 	i915_hotplug_interrupt_update_locked(dev_priv,
-				      (HOTPLUG_INT_EN_MASK
-				       | CRT_HOTPLUG_VOLTAGE_COMPARE_MASK),
-				      hotplug_en);
+					     HOTPLUG_INT_EN_MASK |
+					     CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
+					     CRT_HOTPLUG_ACTIVATION_PERIOD_64,
+					     hotplug_en);

Or maybe just ~CRT_HOTPLUG_FORCE_DETECT ?

Quoted 5 lines

This patch already potentially changes behaviour by explicitly setting the activation period to zero (CRT_HOTPLUG_ACTIVATION_PERIOD_32) on non-g4x. Previously it was "don't care". Call me coward, but I am not comfortable with setting the rest of the bits to zero, at least not in the context of this fix, and risking regressions on old machines.

Quoted 3 lines

Might be a notch too paranoid, but we've always had that rmw in there.

Pushed to drm-intel-next-fixes, thanks for the review.

If someone(tm) wants to remove the rmw, it should be through dinq.

BR,
Jani.

Quoted 24 lines
Quoted 24 lines

BR,
Jani.

Quoted 15 lines
Quoted 11 lines
drivers/gpu/drm/i915/i915_irq.c +0 -0
 }
 
 static irqreturn_t i965_irq_handler(int irq, void *arg)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä
Intel OTC
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw
In reply to Jani Nikula
Quoted 46 lines · Jani Nikula
Quoted 33 lines · Ville Syrjälä
Quoted 32 lines · Jani Nikula

commit 0706f17c307b056ff6f1848320ba82d76945a6ff

Author: Egbert Eich <[email protected]>
Date:   Wed Sep 23 16:15:27 2015 +0200

drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2

added a check with WARN to ensure only bits within the mask are enabled. Turns out that doesn't hold for G4X, which spits out:

[    2.641439] ------------[ cut here ]------------
[    2.641444] WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/i915/i915_irq.c:182 i915_hotplug_interrupt_update_locked+0x45/0x83()
[    2.641446] WARN_ON(bits & ~mask)

etc.

Add CRT_HOTPLUG_ACTIVATION_PERIOD_64 to the mask to fix the warning.

References: https://bugzilla.kernel.org/show_bug.cgi?id=104991

Fixes 0706f17c307b ("drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2")
Cc Egbert Eich <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +0 -0
index 7f91f74961f4..5b9f63d4318b 100644
@@ -4236,9 +4236,10 @@ static void i915_hpd_irq_setup(struct drm_device *dev)
 
Quoted 11 lines

drivers/gpu/drm/i915/i915_irq.c static void i915_hpd_irq_setup(struct drm_device *dev) · line 4242

Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +4 -3
 	/* Ignore TV since it's buggy */
 	i915_hotplug_interrupt_update_locked(dev_priv,
-				      (HOTPLUG_INT_EN_MASK
-				       | CRT_HOTPLUG_VOLTAGE_COMPARE_MASK),
-				      hotplug_en);
+					     HOTPLUG_INT_EN_MASK |
+					     CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
+					     CRT_HOTPLUG_ACTIVATION_PERIOD_64,
+					     hotplug_en);

Or maybe just ~CRT_HOTPLUG_FORCE_DETECT ?

Quoted 3 lines

This patch already potentially changes behaviour by explicitly setting the activation period to zero (CRT_HOTPLUG_ACTIVATION_PERIOD_32) on non-g4x. Previously it was "don't care".

It was already cleared in irq pre/postinstall.

Quoted 26 lines

Call me coward, but I am not
comfortable with setting the rest of the bits to zero, at least not in the context of this fix, and risking regressions on old machines.

BR,
Jani.

Quoted 15 lines
Quoted 11 lines
drivers/gpu/drm/i915/i915_irq.c +0 -0
 }
 
 static irqreturn_t i965_irq_handler(int irq, void *arg)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä
Intel OTC
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
Quoted 47 lines · Ville Syrjälä
Quoted 46 lines · Jani Nikula
Quoted 44 lines · Ville Syrjälä
Quoted 31 lines · Jani Nikula

commit 0706f17c307b056ff6f1848320ba82d76945a6ff

Author: Egbert Eich <[email protected]>
Date:   Wed Sep 23 16:15:27 2015 +0200

drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2

added a check with WARN to ensure only bits within the mask are enabled. Turns out that doesn't hold for G4X, which spits out:

[    2.641439] ------------[ cut here ]------------
[    2.641444] WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/i915/i915_irq.c:182 i915_hotplug_interrupt_update_locked+0x45/0x83()
[    2.641446] WARN_ON(bits & ~mask)

etc.

Add CRT_HOTPLUG_ACTIVATION_PERIOD_64 to the mask to fix the warning.

References: https://bugzilla.kernel.org/show_bug.cgi?id=104991

Fixes 0706f17c307b ("drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2")
Cc Egbert Eich <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +0 -0
index 7f91f74961f4..5b9f63d4318b 100644

drivers/gpu/drm/i915/i915_irq.c static void i915_hpd_irq_setup(struct drm_device *dev) · line 4242

Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +4 -3
@@ -4236,9 +4236,10 @@ static void i915_hpd_irq_setup(struct drm_device *dev)
 
 	/* Ignore TV since it's buggy */
 	i915_hotplug_interrupt_update_locked(dev_priv,
-				      (HOTPLUG_INT_EN_MASK
-				       | CRT_HOTPLUG_VOLTAGE_COMPARE_MASK),
-				      hotplug_en);
+					     HOTPLUG_INT_EN_MASK |
+					     CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
+					     CRT_HOTPLUG_ACTIVATION_PERIOD_64,
+					     hotplug_en);

Or maybe just ~CRT_HOTPLUG_FORCE_DETECT ?

Quoted 5 lines
Quoted 3 lines

This patch already potentially changes behaviour by explicitly setting the activation period to zero (CRT_HOTPLUG_ACTIVATION_PERIOD_32) on non-g4x. Previously it was "don't care".

It was already cleared in irq pre/postinstall.

Fair enough. Anyway I'd like the further change to simmer in dinq first; the fix here was for drm-intel-next-fixes.

BR,
Jani.

Quoted 27 lines
Quoted 27 lines

Call me coward, but I am not
comfortable with setting the rest of the bits to zero, at least not in the context of this fix, and risking regressions on old machines.

BR,
Jani.

Quoted 15 lines
Quoted 11 lines
drivers/gpu/drm/i915/i915_irq.c +0 -0
 }
 
 static irqreturn_t i965_irq_handler(int irq, void *arg)
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä
Intel OTC
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw
In reply to Jani Nikula

Hi,

no more warnings with this patch.
Thank you!

Am 21.10.2015 um 16:22 schrieb Jani Nikula:

Quoted 45 lines

commit 0706f17c307b056ff6f1848320ba82d76945a6ff

Author: Egbert Eich <[email protected]>
Date:   Wed Sep 23 16:15:27 2015 +0200

drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2

added a check with WARN to ensure only bits within the mask are enabled. Turns out that doesn't hold for G4X, which spits out:

[    2.641439] ------------[ cut here ]------------
[    2.641444] WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/i915/i915_irq.c:182 i915_hotplug_interrupt_update_locked+0x45/0x83()
[    2.641446] WARN_ON(bits & ~mask)

etc.

Add CRT_HOTPLUG_ACTIVATION_PERIOD_64 to the mask to fix the warning.

References: https://bugzilla.kernel.org/show_bug.cgi?id=104991

Fixes 0706f17c307b ("drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2")
Cc Egbert Eich <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +4 -3
index 7f91f74961f4..5b9f63d4318b 100644
@@ -4236,9 +4236,10 @@ static void i915_hpd_irq_setup(struct drm_device *dev)
 
 	/* Ignore TV since it's buggy */
 	i915_hotplug_interrupt_update_locked(dev_priv,
-				      (HOTPLUG_INT_EN_MASK
-				       | CRT_HOTPLUG_VOLTAGE_COMPARE_MASK),
-				      hotplug_en);
+					     HOTPLUG_INT_EN_MASK |
+					     CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
+					     CRT_HOTPLUG_ACTIVATION_PERIOD_64,
+					     hotplug_en);
 }
 
 static irqreturn_t i965_irq_handler(int irq, void *arg)
Signature · 2 lines
Regards,
Oleksij

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx