openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/skl: Log the order in which we flush the pipes in the WM code 

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Damien Lespiau 2014-11-04 17:07:03 +00:00 committed by Daniel Vetter
parent 0e8fb7ba7c
commit d21b795c41
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/i915/intel_pm.c
View File

@ -3536,11 +3536,14 @@ static void skl_write_wm_values(struct drm_i915_private *dev_priv,
* We need to sequence the re-allocation: C, B, A (and not B, C, A). * We need to sequence the re-allocation: C, B, A (and not B, C, A).
*/ */
static void skl_wm_flush_pipe(struct drm_i915_private *dev_priv, enum pipe pipe) static void
skl_wm_flush_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, int pass)
{ {
struct drm_device *dev = dev_priv->dev; struct drm_device *dev = dev_priv->dev;
int plane; int plane;
DRM_DEBUG_KMS("flush pipe %c (pass %d)\n", pipe_name(pipe), pass);
for_each_plane(pipe, plane) { for_each_plane(pipe, plane) {
I915_WRITE(PLANE_SURF(pipe, plane), I915_WRITE(PLANE_SURF(pipe, plane),
I915_READ(PLANE_SURF(pipe, plane))); I915_READ(PLANE_SURF(pipe, plane)));
@ -3591,7 +3594,7 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
if (!skl_ddb_allocation_included(cur_ddb, new_ddb, pipe)) if (!skl_ddb_allocation_included(cur_ddb, new_ddb, pipe))
continue; continue;
skl_wm_flush_pipe(dev_priv, pipe); skl_wm_flush_pipe(dev_priv, pipe, 1);
intel_wait_for_vblank(dev, pipe); intel_wait_for_vblank(dev, pipe);
reallocated[pipe] = true; reallocated[pipe] = true;
@ -3616,7 +3619,7 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
if (skl_ddb_entry_size(&new_ddb->pipe[pipe]) < if (skl_ddb_entry_size(&new_ddb->pipe[pipe]) <
skl_ddb_entry_size(&cur_ddb->pipe[pipe])) { skl_ddb_entry_size(&cur_ddb->pipe[pipe])) {
skl_wm_flush_pipe(dev_priv, pipe); skl_wm_flush_pipe(dev_priv, pipe, 2);
intel_wait_for_vblank(dev, pipe); intel_wait_for_vblank(dev, pipe);
} }
@ -3642,7 +3645,7 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv,
if (reallocated[pipe]) if (reallocated[pipe])
continue; continue;
skl_wm_flush_pipe(dev_priv, pipe); skl_wm_flush_pipe(dev_priv, pipe, 3);
} }
} }