[Intel-gfx] [PATCH 02/10] drm/i915: Turn intel_color_check() into a vfunc

[Matt Roper]

On Mon, Mar 18, 2019 at 06:13:09PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> The current intel_color_check() is a mess, and worse yet it is
> in fact incorrect for several platforms. The hardware has
> evolved quite a bit over the years, so let's just go for a clean
> split between the platforms by turning this into a vfunc.
> The actual work to split it up will follow.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h    |  1 +
>  drivers/gpu/drm/i915/intel_color.c | 12 +++++++++++-
>  2 files changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index c65c2e6649df..38dfeb110dd4 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -320,6 +320,7 @@ struct drm_i915_display_funcs {
>  	/* display clock increase/decrease */
>  	/* pll clock increase/decrease */
>  
> +	int (*color_check)(struct intel_crtc_state *crtc_state);
>  	/*
>  	 * Program double buffered color management registers during
>  	 * vblank evasion. The registers should then latch during the
> diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c
> index b6a992a5b14f..e68c936c784b 100644
> --- a/drivers/gpu/drm/i915/intel_color.c
> +++ b/drivers/gpu/drm/i915/intel_color.c
> @@ -704,6 +704,13 @@ void intel_color_commit(const struct intel_crtc_state *crtc_state)
>  	dev_priv->display.color_commit(crtc_state);
>  }
>  
> +int intel_color_check(struct intel_crtc_state *crtc_state)
> +{
> +	struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev);
> +
> +	return dev_priv->display.color_check(crtc_state);
> +}
> +
>  static bool need_plane_update(struct intel_plane *plane,
>  			      const struct intel_crtc_state *crtc_state)
>  {
> @@ -820,7 +827,7 @@ static u32 chv_cgm_mode(const struct intel_crtc_state *crtc_state)
>  	return cgm_mode;
>  }
>  
> -int intel_color_check(struct intel_crtc_state *crtc_state)
> +static int _intel_color_check(struct intel_crtc_state *crtc_state)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev);
>  	const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut;
> @@ -894,6 +901,7 @@ void intel_color_init(struct intel_crtc *crtc)
>  			dev_priv->display.load_luts = i9xx_load_luts;
>  
>  		dev_priv->display.color_commit = i9xx_color_commit;
> +		dev_priv->display.color_check = _intel_color_check;

It might look a bit nicer to assign these in the same order they show up
in the vfunc structure (check first, commit second).  I think your later
patches wind up eventually reversing the order anyway.

But either way,

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

>  	} else {
>  		if (INTEL_GEN(dev_priv) >= 11)
>  			dev_priv->display.load_luts = icl_load_luts;
> @@ -910,6 +918,8 @@ void intel_color_init(struct intel_crtc *crtc)
>  			dev_priv->display.color_commit = hsw_color_commit;
>  		else
>  			dev_priv->display.color_commit = ilk_color_commit;
> +
> +		dev_priv->display.color_check = _intel_color_check;
>  	}
>  
>  	/* Enable color management support when we have degamma & gamma LUTs. */
> -- 
> 2.19.2
> 

-- 
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795