* [PATCH v1 1/1] drm: drop unused drm_crtc callback
@ 2020-02-15 17:33 Sam Ravnborg
2020-02-15 19:09 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Sam Ravnborg @ 2020-02-15 17:33 UTC (permalink / raw)
To: dri-devel, Daniel Vetter
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>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
---
Stumbled upon this and dediced to check if it was used.
Build tested with allyesconfig, allmodconfig for relevant architectures.
Sam
drivers/gpu/drm/drm_crtc_helper.c | 4 ----
include/drm/drm_modeset_helper_vtables.h | 16 ----------------
2 files changed, 20 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 93a4eec429e8..a4d36aca45ea 100644
--- 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 0afaf58da40d..7c20b1c8b6a7 100644
--- 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:
*
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v1 1/1] drm: drop unused drm_crtc callback
2020-02-15 17:33 [PATCH v1 1/1] drm: drop unused drm_crtc callback Sam Ravnborg
@ 2020-02-15 19:09 ` Daniel Vetter
2020-02-15 21:12 ` Sam Ravnborg
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2020-02-15 19:09 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: dri-devel
On Sat, Feb 15, 2020 at 6:33 PM Sam Ravnborg <sam@ravnborg.org> wrote:
>
> 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>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>
> Stumbled upon this and dediced to check if it was used.
> Build tested with allyesconfig, allmodconfig for relevant architectures.
Nice catch!
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Sam
>
>
> drivers/gpu/drm/drm_crtc_helper.c | 4 ----
> include/drm/drm_modeset_helper_vtables.h | 16 ----------------
> 2 files changed, 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
> index 93a4eec429e8..a4d36aca45ea 100644
> --- 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 0afaf58da40d..7c20b1c8b6a7 100644
> --- 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:
> *
> --
> 2.20.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v1 1/1] drm: drop unused drm_crtc callback
2020-02-15 19:09 ` Daniel Vetter
@ 2020-02-15 21:12 ` Sam Ravnborg
0 siblings, 0 replies; 3+ messages in thread
From: Sam Ravnborg @ 2020-02-15 21:12 UTC (permalink / raw)
To: Daniel Vetter; +Cc: dri-devel
On Sat, Feb 15, 2020 at 08:09:40PM +0100, Daniel Vetter wrote:
> On Sat, Feb 15, 2020 at 6:33 PM Sam Ravnborg <sam@ravnborg.org> wrote:
> >
> > 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>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> >
> > Stumbled upon this and dediced to check if it was used.
> > Build tested with allyesconfig, allmodconfig for relevant architectures.
>
> Nice catch!
>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Thanks for the quick review.
Applied and pushed out.
Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-15 21:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-15 17:33 [PATCH v1 1/1] drm: drop unused drm_crtc callback Sam Ravnborg
2020-02-15 19:09 ` Daniel Vetter
2020-02-15 21:12 ` Sam Ravnborg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.