Drivers no longer have any need for these callbacks, and there are no
users. Zap. Zap-zap-zzzap-p-pp-p.

Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch>
Signed-off-by: Peter Rosin <p...@axentia.se>
---
 include/drm/drm_crtc.h                   |  8 --------
 include/drm/drm_fb_helper.h              | 32 --------------------------------
 include/drm/drm_modeset_helper_vtables.h | 16 ----------------
 3 files changed, 56 deletions(-)

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 3a911a64c257..0cc89623abe6 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -358,14 +358,6 @@ struct drm_crtc_funcs {
         * drm_crtc_enable_color_mgmt(), which then supports the legacy gamma
         * interface through the drm_atomic_helper_legacy_gamma_set()
         * compatibility implementation.
-        *
-        * NOTE:
-        *
-        * Drivers that support gamma tables and also fbdev emulation through
-        * the provided helper library need to take care to fill out the gamma
-        * hooks for both. Currently there's a bit an unfortunate duplication
-        * going on, which should eventually be unified to just one set of
-        * hooks.
         */
        int (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
                         uint32_t size,
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index ea170b96e88d..21c56305df1d 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -85,38 +85,6 @@ struct drm_fb_helper_surface_size {
  */
 struct drm_fb_helper_funcs {
        /**
-        * @gamma_set:
-        *
-        * Set the given gamma LUT register on the given CRTC.
-        *
-        * This callback is optional.
-        *
-        * FIXME:
-        *
-        * This callback is functionally redundant with the core gamma table
-        * support and simply exists because the fbdev hasn't yet been
-        * refactored to use the core gamma table interfaces.
-        */
-       void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green,
-                         u16 blue, int regno);
-       /**
-        * @gamma_get:
-        *
-        * Read the given gamma LUT register on the given CRTC, used to save the
-        * current LUT when force-restoring the fbdev for e.g. kdbg.
-        *
-        * This callback is optional.
-        *
-        * FIXME:
-        *
-        * This callback is functionally redundant with the core gamma table
-        * support and simply exists because the fbdev hasn't yet been
-        * refactored to use the core gamma table interfaces.
-        */
-       void (*gamma_get)(struct drm_crtc *crtc, u16 *red, u16 *green,
-                         u16 *blue, int regno);
-
-       /**
         * @fb_probe:
         *
         * Driver callback to allocate and initialize the fbdev info structure.
diff --git a/include/drm/drm_modeset_helper_vtables.h 
b/include/drm/drm_modeset_helper_vtables.h
index 06569845708c..6cdcb4263a73 100644
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -267,22 +267,6 @@ struct drm_crtc_helper_funcs {
                                    enum mode_set_atomic);
 
        /**
-        * @load_lut:
-        *
-        * Load a LUT prepared with the &drm_fb_helper_funcs.gamma_set vfunc.
-        *
-        * This callback is optional and is only used by the fbdev emulation
-        * helpers.
-        *
-        * FIXME:
-        *
-        * This callback is functionally redundant with the core gamma table
-        * support and simply exists because the fbdev hasn't yet been
-        * refactored to use the core gamma table interfaces.
-        */
-       void (*load_lut)(struct drm_crtc *crtc);
-
-       /**
         * @disable:
         *
         * This callback should be used to disable the CRTC. With the atomic
-- 
2.11.0

Reply via email to