drm: remove unused and redundant callbacks

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.vetter@ffwll.ch>
Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20170713162538.22788-15-peda@axentia.se

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 3a911a64c257e11ca54bdb2eb780cc62e2f445c1..0cc89623abe6e90ea4d53e91613c81dc8213ccee 100644 (file)
--- 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 a5ea6ffdfeccaf40c188ec90a57b8e18576ff9f0..33fe959277428baa28922c8d35c44a854474117c 100644 (file)
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -84,38 +84,6 @@ struct drm_fb_helper_surface_size {
  * Driver callbacks used by the fbdev emulation helper library.
  */
 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:
         *

diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
index 810c2aae9d818430e1f259a04441a1629238d680..c55cf3ff68477b8b6e0009a8c54e5b33238df9d5 100644 (file)
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -266,22 +266,6 @@ struct drm_crtc_helper_funcs {
                                    struct drm_framebuffer *fb, int x, int y,
                                    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:
         *