Skip to contentSkip to conversation

drm/i915/skl: Correcting the flushing of pipe

PATCH Applied [email protected] 5 participants 5 messages Dec 11, 2014 – Dec 15, 2014

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

PATCH 1/1 drm/i915/skl: Correcting the flushing of pipe

From: Sonika Jindal <[email protected]>

We were incorreectly bypassing the flush everytime which led to fifo underrun when more than one plane is enabled.

---
 drivers/gpu/drm/i915/intel_pm.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -2
index 5748bf9..8cd045a 100644
@@ -3633,9 +3633,8 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
 		    skl_ddb_entry_size(&cur_ddb->pipe[pipe])) {
 			skl_wm_flush_pipe(dev_priv, pipe, 2);
 			intel_wait_for_vblank(dev, pipe);
+			reallocated[pipe] = true;
 		}
-
-		reallocated[pipe] = true;
 	}
 
 	/*
Signature · 6 lines
1.7.10.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · On 12/11/2014 12:28 PM, [email protected] wrote:

From: Sonika Jindal <[email protected]>

We were incorreectly bypassing the flush everytime which led to fifo underrun when more than one plane is enabled.

---
  drivers/gpu/drm/i915/intel_pm.c |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index 5748bf9..8cd045a 100644

drivers/gpu/drm/i915/intel_pm.c static void skl_flush_wm_values(struct drm_i915_private *dev_priv, · line 3640

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +1 -2
@@ -3633,9 +3633,8 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
  		    skl_ddb_entry_size(&cur_ddb->pipe[pipe])) {
  			skl_wm_flush_pipe(dev_priv, pipe, 2);
  			intel_wait_for_vblank(dev, pipe);
+			reallocated[pipe] = true;
  		}
-
-		reallocated[pipe] = true;
  	}
 
  	/*

Works like a charm now!

Regards,

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

#2 lore raw
Quoted 26 lines · Tvrtko Ursulin
Quoted 24 lines · On 12/11/2014 12:28 PM, [email protected] wrote:

From: Sonika Jindal <[email protected]>

We were incorreectly bypassing the flush everytime which led to fifo underrun when more than one plane is enabled.

---
 drivers/gpu/drm/i915/intel_pm.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -2
index 5748bf9..8cd045a 100644
@@ -3633,9 +3633,8 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
 		    skl_ddb_entry_size(&cur_ddb->pipe[pipe])) {
 			skl_wm_flush_pipe(dev_priv, pipe, 2);
 			intel_wait_for_vblank(dev, pipe);
+			reallocated[pipe] = true;
 		}
-
-		reallocated[pipe] = true;
 	}
 
Quoted 5 lines

drivers/gpu/drm/i915/intel_pm.c static void skl_flush_wm_values(struct drm_i915_private *dev_priv, · line 3640

Quoted 1 line
drivers/gpu/drm/i915/intel_pm.c +0 -0
 	/*

Works like a charm now!

Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 1/1
#3 lore raw
In reply to [email protected]

-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 364/364 364/364
ILK +1-2 364/366 363/366

SNB                                  448/450              448/450
IVB                                  497/498              497/498
BYT                                  289/289              289/289
HSW                                  563/564              563/564
BDW                                  417/417              417/417
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
 ILK  igt_kms_flip_blocking-absolute-wf_vblank-interruptible      DMESG_WARN(1, M26)PASS(8, M26)      DMESG_WARN(1, M26)
 ILK  igt_kms_flip_flip-vs-rmfb-interruptible      NSPT(1, M26)PASS(6, M26)      NSPT(1, M26)
 ILK  igt_kms_flip_wf_vblank-ts-check      DMESG_WARN(7, M26)PASS(24, M26M37)      PASS(1, M26)

Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#4 lore raw
In reply to [email protected]
Quoted 15 lines · On 12/11/2014 5:58 PM, [email protected] wrote:

From: Sonika Jindal <[email protected]>

We were incorreectly bypassing the flush everytime which led to fifo underrun when more than one plane is enabled.

---
  drivers/gpu/drm/i915/intel_pm.c |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index 5748bf9..8cd045a 100644

drivers/gpu/drm/i915/intel_pm.c static void skl_flush_wm_values(struct drm_i915_private *dev_priv, · line 3640

Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +1 -2
@@ -3633,9 +3633,8 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
  		    skl_ddb_entry_size(&cur_ddb->pipe[pipe])) {
  			skl_wm_flush_pipe(dev_priv, pipe, 2);
  			intel_wait_for_vblank(dev, pipe);
+			reallocated[pipe] = true;
  		}
-
-		reallocated[pipe] = true;
  	}
 
  	/*

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