drm/i915/color: hide struct intel_color_funcs

The struct is only needed in intel_color.c, move it there.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/68cf44fab55c047253c3ed87f8afcf0a86fa157a.1643896905.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index de3ded1e327a33527c03b3fd0db35bbab977b30a..8f8b34b60f276eb07705bd98b3bf97e207e28031 100644 (file)
--- 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 aea12e456af057ecf6e1f117e47979e2e66c94f4..2c227250d88fa3a43cc224d32e0f816da5e8ba58 100644 (file)
--- 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);
 };