| Message ID | 20200305155950.2705-17-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | drm: Convert drivers to drm_simple_encoder_init() | expand |
On 05/03/2020 17:59, Thomas Zimmermann wrote: > The tidss driver uses an empty implementation for its encoder. Replace > the code with the generic simple encoder. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Jyri Sarha <jsarha@ti.com> > --- > drivers/gpu/drm/tidss/tidss_encoder.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/tidss/tidss_encoder.c b/drivers/gpu/drm/tidss/tidss_encoder.c > index 83785b0a66a9..4c0558286f5e 100644 > --- a/drivers/gpu/drm/tidss/tidss_encoder.c > +++ b/drivers/gpu/drm/tidss/tidss_encoder.c > @@ -8,8 +8,9 @@ > > #include <drm/drm_crtc.h> > #include <drm/drm_crtc_helper.h> > -#include <drm/drm_panel.h> > #include <drm/drm_of.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_simple_kms_helper.h> > > #include "tidss_crtc.h" > #include "tidss_drv.h" > @@ -59,10 +60,6 @@ static const struct drm_encoder_helper_funcs encoder_helper_funcs = { > .atomic_check = tidss_encoder_atomic_check, > }; > > -static const struct drm_encoder_funcs encoder_funcs = { > - .destroy = drm_encoder_cleanup, > -}; > - > struct drm_encoder *tidss_encoder_create(struct tidss_device *tidss, > u32 encoder_type, u32 possible_crtcs) > { > @@ -75,8 +72,7 @@ struct drm_encoder *tidss_encoder_create(struct tidss_device *tidss, > > enc->possible_crtcs = possible_crtcs; > > - ret = drm_encoder_init(&tidss->ddev, enc, &encoder_funcs, > - encoder_type, NULL); > + ret = drm_simple_encoder_init(&tidss->ddev, enc, encoder_type); > if (ret < 0) > return ERR_PTR(ret); > >
diff --git a/drivers/gpu/drm/tidss/tidss_encoder.c b/drivers/gpu/drm/tidss/tidss_encoder.c index 83785b0a66a9..4c0558286f5e 100644 --- a/drivers/gpu/drm/tidss/tidss_encoder.c +++ b/drivers/gpu/drm/tidss/tidss_encoder.c @@ -8,8 +8,9 @@ #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> -#include <drm/drm_panel.h> #include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_simple_kms_helper.h> #include "tidss_crtc.h" #include "tidss_drv.h" @@ -59,10 +60,6 @@ static const struct drm_encoder_helper_funcs encoder_helper_funcs = { .atomic_check = tidss_encoder_atomic_check, }; -static const struct drm_encoder_funcs encoder_funcs = { - .destroy = drm_encoder_cleanup, -}; - struct drm_encoder *tidss_encoder_create(struct tidss_device *tidss, u32 encoder_type, u32 possible_crtcs) { @@ -75,8 +72,7 @@ struct drm_encoder *tidss_encoder_create(struct tidss_device *tidss, enc->possible_crtcs = possible_crtcs; - ret = drm_encoder_init(&tidss->ddev, enc, &encoder_funcs, - encoder_type, NULL); + ret = drm_simple_encoder_init(&tidss->ddev, enc, encoder_type); if (ret < 0) return ERR_PTR(ret);
The tidss driver uses an empty implementation for its encoder. Replace the code with the generic simple encoder. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/gpu/drm/tidss/tidss_encoder.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)