On Tue, Oct 16, 2018 at 03:01:33PM -0700, Paulo Zanoni wrote:
> Stop passing modeset state structures to functions that should work
> only with the skl_wm_params. The only use for cstate there was to
> reach dev_priv, so pass it directly.
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index b01f3d807ff6..dac2613aaaa3 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4836,13 +4836,11 @@ skl_compute_linetime_wm(struct intel_crtc_state *cstate)
> return linetime_wm;
> }
>
> -static void skl_compute_transition_wm(struct intel_crtc_state *cstate,
> +static void skl_compute_transition_wm(const struct drm_i915_private *dev_priv,
> struct skl_wm_params *wp,
> struct skl_wm_level *wm_l0,
> struct skl_wm_level *trans_wm /* out */)
> {
> - struct drm_device *dev = cstate->base.crtc->dev;
> - const struct drm_i915_private *dev_priv = to_i915(dev);
> uint16_t trans_min, trans_y_tile_min;
> const uint16_t trans_amount = 10; /* This is configurable amount */
> uint16_t wm0_sel_res_b, trans_offset_b, res_blocks;
> @@ -4941,7 +4939,7 @@ static int skl_build_pipe_wm(struct intel_crtc_state *cstate,
> return ret;
> }
>
> - skl_compute_transition_wm(cstate, &wm_params, &wm->wm[0],
> + skl_compute_transition_wm(dev_priv, &wm_params, &wm->wm[0],
> &wm->trans_wm);
>
> /* uv plane watermarks must also be validated for NV12/Planar */
> --
> 2.14.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
