[Intel-gfx] [PATCH 01/10] drm/i915/display: remove intel_display_commit_duplicated_state()

[Gustavo Sousa]

Quoting Jani Nikula (2023-04-13 06:47:27)
> This seems like an unnecessary wrapper layer. Removing it will be
> helpful later.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Gustavo Sousa <gustavo.sousa at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 28 +++++++-------------
>  1 file changed, 10 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 27b47680573a..1c0149adcf49 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -701,20 +701,6 @@ intel_plane_fence_y_offset(const struct intel_plane_state *plane_state)
>         return y;
>  }
>  
> -static int
> -intel_display_commit_duplicated_state(struct intel_atomic_state *state,
> -                                struct drm_modeset_acquire_ctx *ctx)
> -{
> -  struct drm_i915_private *i915 = to_i915(state->base.dev);
> -  int ret;
> -
> -  ret = drm_atomic_helper_commit_duplicated_state(&state->base, ctx);
> -
> -  drm_WARN_ON(&i915->drm, ret == -EDEADLK);
> -
> -  return ret;
> -}
> -
>  static int
>  __intel_display_resume(struct drm_i915_private *i915,
>                        struct drm_atomic_state *state,
> @@ -722,7 +708,7 @@ __intel_display_resume(struct drm_i915_private *i915,
>  {
>         struct drm_crtc_state *crtc_state;
>         struct drm_crtc *crtc;
> -  int i;
> +  int ret, i;
>  
>         intel_modeset_setup_hw_state(i915, ctx);
>         intel_vga_redisable(i915);
> @@ -748,7 +734,11 @@ __intel_display_resume(struct drm_i915_private *i915,
>         if (!HAS_GMCH(i915))
>                 to_intel_atomic_state(state)->skip_intermediate_wm = true;
>  
> -  return intel_display_commit_duplicated_state(to_intel_atomic_state(state), ctx);
> +  ret = drm_atomic_helper_commit_duplicated_state(state, ctx);
> +
> +  drm_WARN_ON(&i915->drm, ret == -EDEADLK);
> +
> +  return ret;
>  }
>  
>  static bool gpu_reset_clobbers_display(struct drm_i915_private *dev_priv)
> @@ -839,10 +829,12 @@ void intel_display_finish_reset(struct drm_i915_private *i915)
>         /* reset doesn't touch the display */
>         if (!gpu_reset_clobbers_display(i915)) {
>                 /* for testing only restore the display */
> -          ret = intel_display_commit_duplicated_state(to_intel_atomic_state(state), ctx);
> -          if (ret)
> +          ret = drm_atomic_helper_commit_duplicated_state(state, ctx);
> +          if (ret) {
> +                  drm_WARN_ON(&i915->drm, ret == -EDEADLK);
>                         drm_err(&i915->drm,
>                                 "Restoring old state failed with %i\n", ret);
> +          }
>         } else {
>                 /*
>                  * The display has been reset as well,
> -- 
> 2.39.2
>