On Thu, Feb 03, 2022 at 04:02:28PM +0200, Jani Nikula wrote:
> The struct is only needed in intel_color.c, move it there.
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_color.c | 19 +++++++++++++++++++
> drivers/gpu/drm/i915/i915_drv.h | 20 +-------------------
> 2 files changed, 20 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
> index de3ded1e327a..8f8b34b60f27 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.c
> +++ b/drivers/gpu/drm/i915/display/intel_color.c
> @@ -28,6 +28,25 @@
> #include "intel_dpll.h"
> #include "vlv_dsi_pll.h"
>
> +struct intel_color_funcs {
> + 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
> + * next vblank start, alongside any other double buffered registers
> + * involved with the same commit.
> + */
> + void (*color_commit)(const struct intel_crtc_state *crtc_state);
> + /*
> + * Load LUTs (and other single buffered color management
> + * registers). Will (hopefully) be called during the vblank
> + * following the latching of any double buffered registers
> + * involved with the same commit.
> + */
> + void (*load_luts)(const struct intel_crtc_state *crtc_state);
> + void (*read_luts)(struct intel_crtc_state *crtc_state);
> +};
> +
> #define CTM_COEFF_SIGN (1ULL << 63)
>
> #define CTM_COEFF_1_0 (1ULL << 32)
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 5a1615c02971..cac18b57808e 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -115,6 +115,7 @@ struct intel_cdclk_config;
> struct intel_cdclk_funcs;
> struct intel_cdclk_state;
> struct intel_cdclk_vals;
> +struct intel_color_funcs;
> struct intel_connector;
> struct intel_crtc;
> struct intel_dp;
> @@ -320,25 +321,6 @@ struct drm_i915_wm_disp_funcs {
> int (*compute_global_watermarks)(struct intel_atomic_state *state);
> };
>
> -struct intel_color_funcs {
> - 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
> - * next vblank start, alongside any other double buffered registers
> - * involved with the same commit.
> - */
> - void (*color_commit)(const struct intel_crtc_state *crtc_state);
> - /*
> - * Load LUTs (and other single buffered color management
> - * registers). Will (hopefully) be called during the vblank
> - * following the latching of any double buffered registers
> - * involved with the same commit.
> - */
> - void (*load_luts)(const struct intel_crtc_state *crtc_state);
> - void (*read_luts)(struct intel_crtc_state *crtc_state);
> -};
> -
> struct intel_hotplug_funcs {
> void (*hpd_irq_setup)(struct drm_i915_private *dev_priv);
> };
> --
> 2.30.2
--
Ville Syrjälä
Intel
