Skip to contentSkip to conversation

drm/i915: Don't load context at driver init time on SNB

PATCH In review Stéphane Marchesin 4 participants 6 messages Aug 10, 2013 – Aug 20, 2013

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

PATCH 1/1 drm/i915: Don't load context at driver init time on SNB

This is a partial revert of b4ae3f22d238617ca11610b29fde16cf8c0bc6e0 (drm/i915: load boot context at driver init time)

This bit breaks hardware video decode for me after resume.

---
 drivers/gpu/drm/i915/intel_pm.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -4
index f895d15..ffa4ab2 100644
@@ -4614,10 +4614,6 @@ static void gen6_init_clock_gating(struct drm_device *dev)
 		   ILK_DPARBUNIT_CLOCK_GATE_ENABLE  |
 		   ILK_DPFDUNIT_CLOCK_GATE_ENABLE);
 
-	/* WaMbcDriverBootEnable:snb */
-	I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) |
-		   GEN6_MBCTL_ENABLE_BOOT_FETCH);
-
 	g4x_disable_trickle_feed(dev);
 
 	/* The default value should be 0x200 according to docs, but the two
Signature · 6 lines
1.8.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 15 lines · Stéphane Marchesin

This is a partial revert of b4ae3f22d238617ca11610b29fde16cf8c0bc6e0 (drm/i915: load boot context at driver init time)

This bit breaks hardware video decode for me after resume.

---
 drivers/gpu/drm/i915/intel_pm.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index f895d15..ffa4ab2 100644

drivers/gpu/drm/i915/intel_pm.c static void gen6_init_clock_gating(struct drm_device *dev) · line 4619

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +0 -4
@@ -4614,10 +4614,6 @@ static void gen6_init_clock_gating(struct drm_device *dev)
 		   ILK_DPARBUNIT_CLOCK_GATE_ENABLE  |
 		   ILK_DPFDUNIT_CLOCK_GATE_ENABLE);
 
-	/* WaMbcDriverBootEnable:snb */
-	I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) |
-		   GEN6_MBCTL_ENABLE_BOOT_FETCH);
-
 	g4x_disable_trickle_feed(dev);
 
 	/* The default value should be 0x200 according to docs, but the two

I was looking at this a bit with Stéphane. One thing we both see is that the bit isn't sticking as it should. Clearly doing the write is having an effect, but something is seriously wrong. Writing the bit manually with IGT does make the bit stick.

Stéphane, could you try to write the bit with IGT before and after resume, and see if it helps?

Adding Jesse to the CC, since he wrote the original patch, maybe he has an idea why it doesn't stick.

Signature · 5 lines
Ben Widawsky, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 32 lines · Ben Widawsky
Quoted 15 lines · Stéphane Marchesin

This is a partial revert of b4ae3f22d238617ca11610b29fde16cf8c0bc6e0 (drm/i915: load boot context at driver init time)

This bit breaks hardware video decode for me after resume.

---
 drivers/gpu/drm/i915/intel_pm.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index f895d15..ffa4ab2 100644

drivers/gpu/drm/i915/intel_pm.c static void gen6_init_clock_gating(struct drm_device *dev) · line 4619

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +0 -4
@@ -4614,10 +4614,6 @@ static void gen6_init_clock_gating(struct drm_device *dev)
                 ILK_DPARBUNIT_CLOCK_GATE_ENABLE  |
                 ILK_DPFDUNIT_CLOCK_GATE_ENABLE);
 
-     /* WaMbcDriverBootEnable:snb */
-     I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) |
-                GEN6_MBCTL_ENABLE_BOOT_FETCH);
-
      g4x_disable_trickle_feed(dev);
 
      /* The default value should be 0x200 according to docs, but the two

I was looking at this a bit with Stéphane. One thing we both see is that the bit isn't sticking as it should. Clearly doing the write is having an effect, but something is seriously wrong. Writing the bit manually with IGT does make the bit stick.

Quoted 2 lines

Stéphane, could you try to write the bit with IGT before and after resume, and see if it helps?

It doesn't seem to stick, and so seems to have no effect.

The confusing thing is that video decode works fine before suspend, even though that reg is 0. And after resume, it is broken, and that reg is still 0. So something else is going on. Maybe this reg is write-once-ever?

Stéphane

#3 lore raw
Quoted 36 lines · Stéphane Marchesin
Quoted 32 lines · Ben Widawsky
Quoted 15 lines · Stéphane Marchesin

This is a partial revert of b4ae3f22d238617ca11610b29fde16cf8c0bc6e0 (drm/i915: load boot context at driver init time)

This bit breaks hardware video decode for me after resume.

---
 drivers/gpu/drm/i915/intel_pm.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index f895d15..ffa4ab2 100644

drivers/gpu/drm/i915/intel_pm.c static void gen6_init_clock_gating(struct drm_device *dev) · line 4619

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +0 -4
@@ -4614,10 +4614,6 @@ static void gen6_init_clock_gating(struct drm_device *dev)
                 ILK_DPARBUNIT_CLOCK_GATE_ENABLE  |
                 ILK_DPFDUNIT_CLOCK_GATE_ENABLE);
 
-     /* WaMbcDriverBootEnable:snb */
-     I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) |
-                GEN6_MBCTL_ENABLE_BOOT_FETCH);
-
      g4x_disable_trickle_feed(dev);
 
      /* The default value should be 0x200 according to docs, but the two

I was looking at this a bit with Stéphane. One thing we both see is that the bit isn't sticking as it should. Clearly doing the write is having an effect, but something is seriously wrong. Writing the bit manually with IGT does make the bit stick.

Quoted 2 lines

Stéphane, could you try to write the bit with IGT before and after resume, and see if it helps?

Quoted 6 lines

It doesn't seem to stick, and so seems to have no effect.

The confusing thing is that video decode works fine before suspend, even though that reg is 0. And after resume, it is broken, and that reg is still 0. So something else is going on. Maybe this reg is write-once-ever?

BSpec says "This Bit is cleared by the Hardware once the Boot fetch is complete."

Signature · 2 lines
Ville Syrjälä
Intel OTC
#4 lore raw
Quoted 39 lines · Ville Syrjälä
Quoted 38 lines · Stéphane Marchesin
Quoted 32 lines · Ben Widawsky
Quoted 15 lines · Stéphane Marchesin

This is a partial revert of b4ae3f22d238617ca11610b29fde16cf8c0bc6e0 (drm/i915: load boot context at driver init time)

This bit breaks hardware video decode for me after resume.

---
 drivers/gpu/drm/i915/intel_pm.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index f895d15..ffa4ab2 100644

drivers/gpu/drm/i915/intel_pm.c static void gen6_init_clock_gating(struct drm_device *dev) · line 4619

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +0 -4
@@ -4614,10 +4614,6 @@ static void gen6_init_clock_gating(struct drm_device *dev)
                 ILK_DPARBUNIT_CLOCK_GATE_ENABLE  |
                 ILK_DPFDUNIT_CLOCK_GATE_ENABLE);
 
-     /* WaMbcDriverBootEnable:snb */
-     I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) |
-                GEN6_MBCTL_ENABLE_BOOT_FETCH);
-
      g4x_disable_trickle_feed(dev);
 
      /* The default value should be 0x200 according to docs, but the two

I was looking at this a bit with Stéphane. One thing we both see is that the bit isn't sticking as it should. Clearly doing the write is having an effect, but something is seriously wrong. Writing the bit manually with IGT does make the bit stick.

Quoted 2 lines

Stéphane, could you try to write the bit with IGT before and after resume, and see if it helps?

It doesn't seem to stick, and so seems to have no effect.

Quoted 7 lines
Quoted 4 lines

The confusing thing is that video decode works fine before suspend, even though that reg is 0. And after resume, it is broken, and that reg is still 0. So something else is going on. Maybe this reg is write-once-ever?

BSpec says "This Bit is cleared by the Hardware once the Boot fetch is complete."

So it seems like the boot fetch doesn't work correctly, but still clears the bit?

Stéphane

#5 lore raw
In reply to Stéphane Marchesin
Quoted 36 lines · On Mon, 12 Aug 2013 10:33:37 -0700 Stéphane Marchesin <[email protected]>…
Quoted 32 lines · Ben Widawsky
Quoted 15 lines · Stéphane Marchesin

This is a partial revert of b4ae3f22d238617ca11610b29fde16cf8c0bc6e0 (drm/i915: load boot context at driver init time)

This bit breaks hardware video decode for me after resume.

---
 drivers/gpu/drm/i915/intel_pm.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index f895d15..ffa4ab2 100644

drivers/gpu/drm/i915/intel_pm.c static void gen6_init_clock_gating(struct drm_device *dev) · line 4619

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +0 -4
@@ -4614,10 +4614,6 @@ static void gen6_init_clock_gating(struct drm_device *dev)
                 ILK_DPARBUNIT_CLOCK_GATE_ENABLE  |
                 ILK_DPFDUNIT_CLOCK_GATE_ENABLE);
 
-     /* WaMbcDriverBootEnable:snb */
-     I915_WRITE(GEN6_MBCTL, I915_READ(GEN6_MBCTL) |
-                GEN6_MBCTL_ENABLE_BOOT_FETCH);
-
      g4x_disable_trickle_feed(dev);
 
      /* The default value should be 0x200 according to docs, but the two

I was looking at this a bit with Stéphane. One thing we both see is that the bit isn't sticking as it should. Clearly doing the write is having an effect, but something is seriously wrong. Writing the bit manually with IGT does make the bit stick.

Quoted 2 lines

Stéphane, could you try to write the bit with IGT before and after resume, and see if it helps?

Quoted 6 lines

It doesn't seem to stick, and so seems to have no effect.

The confusing thing is that video decode works fine before suspend, even though that reg is 0. And after resume, it is broken, and that reg is still 0. So something else is going on. Maybe this reg is write-once-ever?

Apparently it is. And if the BIOS writes that bit, we're not supposed to write it either. However, since it's WO, we can't easily tell if it's been written! I'm trying to get some more info on this, but at the very least it seems like we might need to avoid writing it on resume...

Signature · 5 lines
Jesse Barnes, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx