Re: [Intel-gfx] [PATCH 2/4] Revert "drm/i915: Move the dbuf pre/post plane update"

[Lisovskiy, Stanislav]

On Mon, May 18, 2020 at 03:23:01PM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä 
> 
> Dbuf slice tracking busted across runtime PM. Back to the
> drawing board.
> 
> This reverts commit c7c0e7ebe4d9963573f81399374e4e95f37fd8e3.
> 
> Signed-off-by: Ville Syrjälä 
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 41 +++-
>  drivers/gpu/drm/i915/intel_pm.c  | 37 --
>  drivers/gpu/drm/i915/intel_pm.h  |  2 -
>  3 files changed, 39 insertions(+), 41 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
> b/drivers/gpu/drm/i915/display/intel_display.c
> index e1407dc28ddc..49577f19ff9c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -15207,6 +15207,43 @@ static void intel_commit_modeset_enables(struct 
> intel_atomic_state *state)
>   }
>  }
>  

Reviewed-by: Stanislav Lisovskiy 

> +static void icl_dbuf_slice_pre_update(struct intel_atomic_state *state)
> +{
> + struct drm_i915_private *dev_priv = to_i915(state->base.dev);
> + const struct intel_dbuf_state *new_dbuf_state =
> + intel_atomic_get_new_dbuf_state(state);
> + const struct intel_dbuf_state *old_dbuf_state =
> + intel_atomic_get_old_dbuf_state(state);
> +
> + if (!new_dbuf_state ||
> + new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
> + return;
> +
> + WARN_ON(!new_dbuf_state->base.changed);
> +
> + gen9_dbuf_slices_update(dev_priv,
> + old_dbuf_state->enabled_slices |
> + new_dbuf_state->enabled_slices);
> +}
> +
> +static void icl_dbuf_slice_post_update(struct intel_atomic_state *state)
> +{
> + struct drm_i915_private *dev_priv = to_i915(state->base.dev);
> + const struct intel_dbuf_state *new_dbuf_state =
> + intel_atomic_get_new_dbuf_state(state);
> + const struct intel_dbuf_state *old_dbuf_state =
> + intel_atomic_get_old_dbuf_state(state);
> +
> + if (!new_dbuf_state ||
> + new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
> + return;
> +
> + WARN_ON(!new_dbuf_state->base.changed);
> +
> + gen9_dbuf_slices_update(dev_priv,
> + new_dbuf_state->enabled_slices);
> +}
> +
>  static void skl_commit_modeset_enables(struct intel_atomic_state *state)
>  {
>   struct drm_i915_private *dev_priv = to_i915(state->base.dev);
> @@ -15447,7 +15484,7 @@ static void intel_atomic_commit_tail(struct 
> intel_atomic_state *state)
>   if (state->modeset)
>   intel_encoders_update_prepare(state);
>  
> - intel_dbuf_pre_plane_update(state);
> + icl_dbuf_slice_pre_update(state);
>  
>   /* Now enable the clocks, plane, pipe, and connectors that we set up. */
>   dev_priv->display.commit_modeset_enables(state);
> @@ -15502,7 +15539,7 @@ static void intel_atomic_commit_tail(struct 
> intel_atomic_state *state)
>   dev_priv->display.optimize_watermarks(state, crtc);
>   }
>  
> - intel_dbuf_post_plane_update(state);
> + icl_dbuf_slice_post_update(state);
>  
>   for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, 
> new_crtc_state, i) {
>   intel_post_plane_update(state, crtc);
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index d40d22eb65da..a92d57d9b759 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -7806,40 +7806,3 @@ int intel_dbuf_init(struct drm_i915_private *dev_priv)
>  
>   return 0;
>  }
> -
> -void intel_dbuf_pre_plane_update(struct intel_atomic_state *state)
> -{
> - struct drm_i915_private *dev_priv = to_i915(state->base.dev);
> - const struct intel_dbuf_state *new_dbuf_state =
> - intel_atomic_get_new_dbuf_state(state);
> - const struct intel_dbuf_state *old_dbuf_state =
> - intel_atomic_get_old_dbuf_state(state);
> -
> - if (!new_dbuf_state ||
> - new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
> - return;
> -
> - WARN_ON(!new_dbuf_state->base.changed);
> -
> - gen9_dbuf_slices_update(dev_priv,
> - old_dbuf_state->enabled_slices |
> - new_dbuf_state->enabled_slices);
> -}
> -
> -void intel_dbuf_post_plane_update(struct intel_atomic_state *state)
> -{
> - struct drm_i915_private *dev_priv = to_i915(state->base.dev);
> - const struct intel_dbuf_state *new_dbuf_state =
> - intel_atomic_get_new_dbuf_state(state);
> - const struct intel_dbuf_state *old_dbuf_state =
> - intel_atomic_get_old_dbuf_state(state);
> -
> - if (!new_dbuf_state ||
> - new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
> - return;
> -
> - WARN_ON(!new_dbuf_state->base.changed);
> 

[Intel-gfx] [PATCH 2/4] Revert "drm/i915: Move the dbuf pre/post plane update"

[Ville Syrjala]

From: Ville Syrjälä 

Dbuf slice tracking busted across runtime PM. Back to the
drawing board.

This reverts commit c7c0e7ebe4d9963573f81399374e4e95f37fd8e3.

Signed-off-by: Ville Syrjälä 
---
 drivers/gpu/drm/i915/display/intel_display.c | 41 +++-
 drivers/gpu/drm/i915/intel_pm.c  | 37 --
 drivers/gpu/drm/i915/intel_pm.h  |  2 -
 3 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index e1407dc28ddc..49577f19ff9c 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -15207,6 +15207,43 @@ static void intel_commit_modeset_enables(struct 
intel_atomic_state *state)
}
 }
 
+static void icl_dbuf_slice_pre_update(struct intel_atomic_state *state)
+{
+   struct drm_i915_private *dev_priv = to_i915(state->base.dev);
+   const struct intel_dbuf_state *new_dbuf_state =
+   intel_atomic_get_new_dbuf_state(state);
+   const struct intel_dbuf_state *old_dbuf_state =
+   intel_atomic_get_old_dbuf_state(state);
+
+   if (!new_dbuf_state ||
+   new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
+   return;
+
+   WARN_ON(!new_dbuf_state->base.changed);
+
+   gen9_dbuf_slices_update(dev_priv,
+   old_dbuf_state->enabled_slices |
+   new_dbuf_state->enabled_slices);
+}
+
+static void icl_dbuf_slice_post_update(struct intel_atomic_state *state)
+{
+   struct drm_i915_private *dev_priv = to_i915(state->base.dev);
+   const struct intel_dbuf_state *new_dbuf_state =
+   intel_atomic_get_new_dbuf_state(state);
+   const struct intel_dbuf_state *old_dbuf_state =
+   intel_atomic_get_old_dbuf_state(state);
+
+   if (!new_dbuf_state ||
+   new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
+   return;
+
+   WARN_ON(!new_dbuf_state->base.changed);
+
+   gen9_dbuf_slices_update(dev_priv,
+   new_dbuf_state->enabled_slices);
+}
+
 static void skl_commit_modeset_enables(struct intel_atomic_state *state)
 {
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
@@ -15447,7 +15484,7 @@ static void intel_atomic_commit_tail(struct 
intel_atomic_state *state)
if (state->modeset)
intel_encoders_update_prepare(state);
 
-   intel_dbuf_pre_plane_update(state);
+   icl_dbuf_slice_pre_update(state);
 
/* Now enable the clocks, plane, pipe, and connectors that we set up. */
dev_priv->display.commit_modeset_enables(state);
@@ -15502,7 +15539,7 @@ static void intel_atomic_commit_tail(struct 
intel_atomic_state *state)
dev_priv->display.optimize_watermarks(state, crtc);
}
 
-   intel_dbuf_post_plane_update(state);
+   icl_dbuf_slice_post_update(state);
 
for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, 
new_crtc_state, i) {
intel_post_plane_update(state, crtc);
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index d40d22eb65da..a92d57d9b759 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -7806,40 +7806,3 @@ int intel_dbuf_init(struct drm_i915_private *dev_priv)
 
return 0;
 }
-
-void intel_dbuf_pre_plane_update(struct intel_atomic_state *state)
-{
-   struct drm_i915_private *dev_priv = to_i915(state->base.dev);
-   const struct intel_dbuf_state *new_dbuf_state =
-   intel_atomic_get_new_dbuf_state(state);
-   const struct intel_dbuf_state *old_dbuf_state =
-   intel_atomic_get_old_dbuf_state(state);
-
-   if (!new_dbuf_state ||
-   new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
-   return;
-
-   WARN_ON(!new_dbuf_state->base.changed);
-
-   gen9_dbuf_slices_update(dev_priv,
-   old_dbuf_state->enabled_slices |
-   new_dbuf_state->enabled_slices);
-}
-
-void intel_dbuf_post_plane_update(struct intel_atomic_state *state)
-{
-   struct drm_i915_private *dev_priv = to_i915(state->base.dev);
-   const struct intel_dbuf_state *new_dbuf_state =
-   intel_atomic_get_new_dbuf_state(state);
-   const struct intel_dbuf_state *old_dbuf_state =
-   intel_atomic_get_old_dbuf_state(state);
-
-   if (!new_dbuf_state ||
-   new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)
-   return;
-
-   WARN_ON(!new_dbuf_state->base.changed);
-
-   gen9_dbuf_slices_update(dev_priv,
-   new_dbuf_state->enabled_slices);
-}
diff --git a/drivers/gpu/drm/i915/intel_pm.h b/drivers/gpu/drm/i915/intel_pm.h
index 6636d2a057cd..3fcc9b6e2cbf 100644
---