[Intel-gfx] [PATCH 03/19] drm/i915: Constify some watermark data

Paulo Zanoni przanoni at gmail.com
Fri Aug 30 22:36:56 CEST 2013


2013/8/30  <ville.syrjala at linux.intel.com>:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> hsw_pipe_wm_parameters and hsw_wm_maximums typically are read only. Make
> them const.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Reviewed-by: GCC 4.7.3
Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 774c57f..96493dc 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2202,7 +2202,7 @@ struct intel_wm_config {
>   * For both WM_PIPE and WM_LP.
>   * mem_value must be in 0.1us units.
>   */
> -static uint32_t ilk_compute_pri_wm(struct hsw_pipe_wm_parameters *params,
> +static uint32_t ilk_compute_pri_wm(const struct hsw_pipe_wm_parameters *params,
>                                    uint32_t mem_value,
>                                    bool is_lp)
>  {
> @@ -2231,7 +2231,7 @@ static uint32_t ilk_compute_pri_wm(struct hsw_pipe_wm_parameters *params,
>   * For both WM_PIPE and WM_LP.
>   * mem_value must be in 0.1us units.
>   */
> -static uint32_t ilk_compute_spr_wm(struct hsw_pipe_wm_parameters *params,
> +static uint32_t ilk_compute_spr_wm(const struct hsw_pipe_wm_parameters *params,
>                                    uint32_t mem_value)
>  {
>         uint32_t method1, method2;
> @@ -2254,7 +2254,7 @@ static uint32_t ilk_compute_spr_wm(struct hsw_pipe_wm_parameters *params,
>   * For both WM_PIPE and WM_LP.
>   * mem_value must be in 0.1us units.
>   */
> -static uint32_t ilk_compute_cur_wm(struct hsw_pipe_wm_parameters *params,
> +static uint32_t ilk_compute_cur_wm(const struct hsw_pipe_wm_parameters *params,
>                                    uint32_t mem_value)
>  {
>         if (!params->active || !params->cur.enabled)
> @@ -2268,7 +2268,7 @@ static uint32_t ilk_compute_cur_wm(struct hsw_pipe_wm_parameters *params,
>  }
>
>  /* Only for WM_LP. */
> -static uint32_t ilk_compute_fbc_wm(struct hsw_pipe_wm_parameters *params,
> +static uint32_t ilk_compute_fbc_wm(const struct hsw_pipe_wm_parameters *params,
>                                    uint32_t pri_val)
>  {
>         if (!params->active || !params->pri.enabled)
> @@ -2419,7 +2419,7 @@ static bool ilk_check_wm(int level,
>
>  static void ilk_compute_wm_level(struct drm_i915_private *dev_priv,
>                                  int level,
> -                                struct hsw_pipe_wm_parameters *p,
> +                                const struct hsw_pipe_wm_parameters *p,
>                                  struct intel_wm_level *result)
>  {
>         uint16_t pri_latency = dev_priv->wm.pri_latency[level];
> @@ -2441,8 +2441,8 @@ static void ilk_compute_wm_level(struct drm_i915_private *dev_priv,
>  }
>
>  static bool hsw_compute_lp_wm(struct drm_i915_private *dev_priv,
> -                             int level, struct hsw_wm_maximums *max,
> -                             struct hsw_pipe_wm_parameters *params,
> +                             int level, const struct hsw_wm_maximums *max,
> +                             const struct hsw_pipe_wm_parameters *params,
>                               struct intel_wm_level *result)
>  {
>         enum pipe pipe;
> @@ -2462,7 +2462,7 @@ static bool hsw_compute_lp_wm(struct drm_i915_private *dev_priv,
>
>  static uint32_t hsw_compute_wm_pipe(struct drm_i915_private *dev_priv,
>                                     enum pipe pipe,
> -                                   struct hsw_pipe_wm_parameters *params)
> +                                   const struct hsw_pipe_wm_parameters *params)
>  {
>         uint32_t pri_val, cur_val, spr_val;
>         /* WM0 latency values stored in 0.1us units */
> @@ -2670,8 +2670,8 @@ static void hsw_compute_wm_parameters(struct drm_device *dev,
>  }
>
>  static void hsw_compute_wm_results(struct drm_device *dev,
> -                                  struct hsw_pipe_wm_parameters *params,
> -                                  struct hsw_wm_maximums *lp_maximums,
> +                                  const struct hsw_pipe_wm_parameters *params,
> +                                  const struct hsw_wm_maximums *lp_maximums,
>                                    struct hsw_wm_values *results)
>  {
>         struct drm_i915_private *dev_priv = dev->dev_private;
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Paulo Zanoni



More information about the Intel-gfx mailing list