Skip to contentSkip to conversation

drm/i915/vlv: Update Wait for FIFO and wait for 20 free entries.

PATCH In review [email protected] 2 participants 2 messages Nov 27, 2013

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

PATCH 2/2 drm/i915/vlv: Update Wait for FIFO and wait for 20 free entries.

From: Deepak S <[email protected]>

On VLV, FIFO will be shared by both SW and HW. So, we read the free entries through register and update dev_priv variable and wait for only 20 entries to be free

---
 drivers/gpu/drm/i915/intel_uncore.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_uncore.c +6 -0
index eac5661..3e7848a 100644
@@ -147,6 +147,12 @@ static int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv)
 {
 	int ret = 0;
 
+	/* On VLV, FIFO will be shared by both SW and HW.
+	 * So, we need to read the FREE_ENTRIES everytime */
+	if (IS_VALLEYVIEW(dev_priv->dev))
+		dev_priv->uncore.fifo_count =
+			__raw_i915_read32(dev_priv, GT_FIFO_FREE_ENTRIES);
+
 	if (dev_priv->uncore.fifo_count < GT_FIFO_NUM_RESERVED_ENTRIES) {
 		int loop = 500;
 		u32 fifo = __raw_i915_read32(dev_priv, GT_FIFO_FREE_ENTRIES);
Signature · 1 line
1.8.4.2
#1 lore raw
Quoted 3 lines · On Wed, Nov 27, 2013 at 09:16:42PM +0530, [email protected] wrote:

From: Deepak S <[email protected]>

On VLV, FIFO will be shared by both SW and HW.

SW I take it means MMIO access coming from the CPU, and HW means eg. LRI from some CS?

Are there any docs clearly stating this? The Gunit HAS is next to useless trying to figure out how the internal register accesses get routed.

Quoted 14 lines

So, we read the
free entries through register and update dev_priv variable and wait for only 20 entries to be free

---
 drivers/gpu/drm/i915/intel_uncore.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_uncore.c +0 -0
index eac5661..3e7848a 100644

drivers/gpu/drm/i915/intel_uncore.c static int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv) · line 154

Quoted 8 lines
drivers/gpu/drm/i915/intel_uncore.c +5 -0
@@ -147,6 +147,12 @@ static int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv)
 {
 	int ret = 0;
 
+	/* On VLV, FIFO will be shared by both SW and HW.
+	 * So, we need to read the FREE_ENTRIES everytime */
+	if (IS_VALLEYVIEW(dev_priv->dev))
+		dev_priv->uncore.fifo_count =
+			__raw_i915_read32(dev_priv, GT_FIFO_FREE_ENTRIES);

This would need to mask the free entries. I sent out a patch to fix the already existing cases, but you'd need to do it here too.

Quoted 11 lines
drivers/gpu/drm/i915/intel_uncore.c +1 -0
+
 	if (dev_priv->uncore.fifo_count < GT_FIFO_NUM_RESERVED_ENTRIES) {
 		int loop = 500;
 		u32 fifo = __raw_i915_read32(dev_priv, GT_FIFO_FREE_ENTRIES);
Signature · 6 lines
1.8.4.2

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä
Intel OTC