drm: drop unused drm_crtc callback

struct drm_encoder_helper_funcs included a callback
named drm_crtc.

There are no users left - so drop it.
There was one reference in drm_crtc_helper.c,
which checked if the value was not NULL.
As it was never assigned this check could be dropped.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200215173342.GA7458@ravnborg.org

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 93a4eec429e8cfda0c15ec4a9ccca29409f53389..a4d36aca45eaa10314ddc355e7120a4b97b906ab 100644 (file)
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -244,10 +244,6 @@ drm_crtc_prepare_encoders(struct drm_device *dev)
                /* Disable unused encoders */
                if (encoder->crtc == NULL)
                        drm_encoder_disable(encoder);
-               /* Disable encoders whose CRTC is about to change */
-               if (encoder_funcs->get_crtc &&
-                   encoder->crtc != (*encoder_funcs->get_crtc)(encoder))
-                       drm_encoder_disable(encoder);
        }
 }
 

diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
index 0afaf58da40dfb856ca916d0c804ea97441ca0c4..7c20b1c8b6a7a0b313cb4028f68a2372ece91bf5 100644 (file)
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -692,22 +692,6 @@ struct drm_encoder_helper_funcs {
                                struct drm_crtc_state *crtc_state,
                                struct drm_connector_state *conn_state);
 
-       /**
-        * @get_crtc:
-        *
-        * This callback is used by the legacy CRTC helpers to work around
-        * deficiencies in its own book-keeping.
-        *
-        * Do not use, use atomic helpers instead, which get the book keeping
-        * right.
-        *
-        * FIXME:
-        *
-        * Currently only nouveau is using this, and as soon as nouveau is
-        * atomic we can ditch this hook.
-        */
-       struct drm_crtc *(*get_crtc)(struct drm_encoder *encoder);
-
        /**
         * @detect:
         *