[PATCH 05/12] drm/imx: Don't set allow_fb_modifiers explicitly

[Lucas Stach]

Am Dienstag, dem 13.04.2021 um 16:04 +0200 schrieb Daniel Vetter:
> On Tue, Apr 13, 2021 at 01:47:28PM +0200, Lucas Stach wrote:
> > Am Dienstag, dem 13.04.2021 um 11:48 +0200 schrieb Daniel Vetter:
> > > Since
> > > 
> > > commit 890880ddfdbe256083170866e49c87618b706ac7
> > > Author: Paul Kocialkowski <paul.kocialkowski at bootlin.com>
> > > Date:   Fri Jan 4 09:56:10 2019 +0100
> > > 
> > >     drm: Auto-set allow_fb_modifiers when given modifiers at plane init
> > > 
> > > this is done automatically as part of plane init, if drivers set the
> > > modifier list correctly. Which is the case here.
> > > 
> > > This one actually set it twice on top of what drm_plane_init does, so
> > > double-redundant!
> > 
> > That's not true. imx-dcss and imx-drm are two totally separate drivers.
> > Maybe we should move imx-drm into its own ipuv3 directory one day to
> > make this more clear. Change is still correct, though.
> 
> Hm I greeped for drm_universal_plane_init and didn't find anythinf for the
> imx main driver ... where are planes set up for that? Need to review that
> they have the modifiers listed in all cases.

That's in drivers/gpu/drm/imx/ipuv3-plane.c and modifiers are always
set on plane init.

Regards,
Lucas

> 
> > 
> > Reviewed-by: Lucas Stach <l.stach at pengutronix.de>
> > 
> > > Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> > > Cc: Philipp Zabel <p.zabel at pengutronix.de>
> > > Cc: Shawn Guo <shawnguo at kernel.org>
> > > Cc: Sascha Hauer <s.hauer at pengutronix.de>
> > > Cc: Pengutronix Kernel Team <kernel at pengutronix.de>
> > > Cc: Fabio Estevam <festevam at gmail.com>
> > > Cc: NXP Linux Team <linux-imx at nxp.com>
> > > Cc: linux-arm-kernel at lists.infradead.org
> > > ---
> > >  drivers/gpu/drm/imx/dcss/dcss-kms.c | 1 -
> > >  drivers/gpu/drm/imx/imx-drm-core.c  | 1 -
> > >  2 files changed, 2 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/imx/dcss/dcss-kms.c b/drivers/gpu/drm/imx/dcss/dcss-kms.c
> > > index b549ce5e7607..37ae68a7fba5 100644
> > > --- a/drivers/gpu/drm/imx/dcss/dcss-kms.c
> > > +++ b/drivers/gpu/drm/imx/dcss/dcss-kms.c
> > > @@ -52,7 +52,6 @@ static void dcss_kms_mode_config_init(struct dcss_kms_dev *kms)
> > >  	config->min_height = 1;
> > >  	config->max_width = 4096;
> > >  	config->max_height = 4096;
> > > -	config->allow_fb_modifiers = true;
> > >  	config->normalize_zpos = true;
> > >  
> > > 
> > > 
> > > 
> > >  	config->funcs = &dcss_drm_mode_config_funcs;
> > > diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
> > > index 2ded8e4f32d0..8be4edaec958 100644
> > > --- a/drivers/gpu/drm/imx/imx-drm-core.c
> > > +++ b/drivers/gpu/drm/imx/imx-drm-core.c
> > > @@ -209,7 +209,6 @@ static int imx_drm_bind(struct device *dev)
> > >  	drm->mode_config.max_height = 4096;
> > >  	drm->mode_config.funcs = &imx_drm_mode_config_funcs;
> > >  	drm->mode_config.helper_private = &imx_drm_mode_config_helpers;
> > > -	drm->mode_config.allow_fb_modifiers = true;
> > >  	drm->mode_config.normalize_zpos = true;
> > >  
> > > 
> > > 
> > > 
> > >  	ret = drmm_mode_config_init(drm);
> > 
> > 
>