Skip to contentSkip to conversation

drm/i915/vlv: reset VLV media force wake request register

PATCH In review Jani Nikula 3 participants 4 messages May 9, 2014

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

PATCH 1/1 drm/i915/vlv: reset VLV media force wake request register

Media force wake get hangs the machine when the system is booted without displays attached. The assumption is that (at least some versions of) the firmware has skipped some initialization in that case.

Empirical evidence suggests we need to reset the media force wake request register in addition to the render one to avoid hangs.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75895

---

Darren, a Tested-by would be much appreciated!

Thanks,
Jani.

---
 drivers/gpu/drm/i915/intel_uncore.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_uncore.c +2 -0
index 76dc185793ce..27fe2df47d73 100644
@@ -185,6 +185,8 @@ static void vlv_force_wake_reset(struct drm_i915_private *dev_priv)
 {
 	__raw_i915_write32(dev_priv, FORCEWAKE_VLV,
 			   _MASKED_BIT_DISABLE(0xffff));
+	__raw_i915_write32(dev_priv, FORCEWAKE_MEDIA_VLV,
+			   _MASKED_BIT_DISABLE(0xffff));
 	/* something from same cacheline, but !FORCEWAKE_VLV */
 	__raw_posting_read(dev_priv, FORCEWAKE_ACK_VLV);
 }
Signature · 1 line
1.9.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Jani Nikula

Media force wake get hangs the machine when the system is booted without displays attached. The assumption is that (at least some versions of) the firmware has skipped some initialization in that case.

Quoted 8 lines

Empirical evidence suggests we need to reset the media force wake request register in addition to the render one to avoid hangs.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75895

Quoted 30 lines

---

Darren, a Tested-by would be much appreciated!

Thanks,
Jani.

---
 drivers/gpu/drm/i915/intel_uncore.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_uncore.c +2 -0
index 76dc185793ce..27fe2df47d73 100644
@@ -185,6 +185,8 @@ static void vlv_force_wake_reset(struct drm_i915_private *dev_priv)
 {
 	__raw_i915_write32(dev_priv, FORCEWAKE_VLV,
 			   _MASKED_BIT_DISABLE(0xffff));
+	__raw_i915_write32(dev_priv, FORCEWAKE_MEDIA_VLV,
+			   _MASKED_BIT_DISABLE(0xffff));
 	/* something from same cacheline, but !FORCEWAKE_VLV */
 	__raw_posting_read(dev_priv, FORCEWAKE_ACK_VLV);
 }
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 1/1
#2 lore raw
In reply to Jani Nikula
Quoted 4 lines · Jani Nikula

Media force wake get hangs the machine when the system is booted without displays attached. The assumption is that (at least some versions of) the firmware has skipped some initialization in that case.

Quoted 8 lines

Empirical evidence suggests we need to reset the media force wake request register in addition to the render one to avoid hangs.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75895

Applied to 3.14.2 and tested on MinnowBoardMax A0 hardware (BayTrail-I, Atom E3825).

* With no display connected, the boot no longer hangs and DRM prints sensible messages during boot:

[    5.968837] [drm] GMBUS [i915 gmbus vga] timed out, falling back to bit
banging on pin 2
[    5.988037] i915 0000:00:02.0: No connectors reported connected with
modes
[    5.995744] [drm] Cannot find any crtc or sizes - going 1024x768
[    6.004716] fbcon: inteldrmfb (fb0) is primary device
[    6.013066] Console: switching to colour frame buffer device 128x48
[    6.034147] i915 0000:00:02.0: fb0: inteldrmfb frame buffer device
[    6.041168] i915 0000:00:02.0: registered panic notifier
[    6.049820] ACPI: Video Device [GFX0] (multi-head: yes  rom: no  post:
no)
[    6.058788] acpi device:30: registered as cooling_device3
[    6.065111] input: Video Bus as
/devices/LNXSYSTM:00/device:00/PNP0A08:00/LNXVIDEO:00/input/input4
[    6.075370] [drm] Initialized i915 1.6.0 20080730 for 0000:00:02.0 on

minor 0

* If a display is subsequently connected and X is restarted, it behaves as expected.

* Booting with a display connected continue to work as expected.

Thank you very much Jani!

Signature · 2 lines
Darren Hart					Open Source Technology Center
[email protected]				            Intel Corporation
#3 lore raw
Quoted 38 lines · Darren Hart
Quoted 4 lines · Jani Nikula

Media force wake get hangs the machine when the system is booted without displays attached. The assumption is that (at least some versions of) the firmware has skipped some initialization in that case.

Quoted 8 lines

Empirical evidence suggests we need to reset the media force wake request register in addition to the render one to avoid hangs.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75895

Applied to 3.14.2 and tested on MinnowBoardMax A0 hardware (BayTrail-I, Atom E3825).

* With no display connected, the boot no longer hangs and DRM prints sensible messages during boot:

[    5.968837] [drm] GMBUS [i915 gmbus vga] timed out, falling back to bit
banging on pin 2
[    5.988037] i915 0000:00:02.0: No connectors reported connected with
modes
[    5.995744] [drm] Cannot find any crtc or sizes - going 1024x768
[    6.004716] fbcon: inteldrmfb (fb0) is primary device
[    6.013066] Console: switching to colour frame buffer device 128x48
[    6.034147] i915 0000:00:02.0: fb0: inteldrmfb frame buffer device
[    6.041168] i915 0000:00:02.0: registered panic notifier
[    6.049820] ACPI: Video Device [GFX0] (multi-head: yes  rom: no  post:
no)
[    6.058788] acpi device:30: registered as cooling_device3
[    6.065111] input: Video Bus as
/devices/LNXSYSTM:00/device:00/PNP0A08:00/LNXVIDEO:00/input/input4
[    6.075370] [drm] Initialized i915 1.6.0 20080730 for 0000:00:02.0 on

minor 0

Quoted 8 lines

* If a display is subsequently connected and X is restarted, it behaves as expected.

* Booting with a display connected continue to work as expected.

Thank you very much Jani!

Pushed to -fixes. Thanks for testing, Darren, and thanks for review, Mika.

BR,
Jani.

Quoted 11 lines
Signature · 10 lines
-- 
Darren Hart					Open Source Technology Center
[email protected]				            Intel Corporation



_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center