Revert "drm/sun4i: drv: Allow framebuffer modifiers in mode config"
diff mbox series

Message ID 20200126065937.9564-1-jernej.skrabec@siol.net
State Mainlined
Commit cf913e9683273f2640501094fa63a67e29f437b3
Headers show
Series
  • Revert "drm/sun4i: drv: Allow framebuffer modifiers in mode config"
Related show

Commit Message

Jernej Škrabec Jan. 26, 2020, 6:59 a.m. UTC
This reverts commit 9db9c0cf5895e4ddde2814360cae7bea9282edd2.

Setting mode_config.allow_fb_modifiers manually is completely
unnecessary. It is set automatically by drm_universal_plane_init() based
on the fact if modifier list is provided or not. Even more, it breaks
DE2 and DE3 as they don't support any modifiers beside linear. Modifiers
aware applications can be confused by provided empty modifier list - at
least linear modifier should be included, but it's not for DE2 and DE3.

Fixes: 9db9c0cf5895 ("drm/sun4i: drv: Allow framebuffer modifiers in mode config")
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
 drivers/gpu/drm/sun4i/sun4i_drv.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Paul Kocialkowski Jan. 27, 2020, 8:14 a.m. UTC | #1
Hi Jernej,

On Sun 26 Jan 20, 07:59, Jernej Skrabec wrote:
> This reverts commit 9db9c0cf5895e4ddde2814360cae7bea9282edd2.
> 
> Setting mode_config.allow_fb_modifiers manually is completely
> unnecessary. It is set automatically by drm_universal_plane_init() based
> on the fact if modifier list is provided or not. Even more, it breaks
> DE2 and DE3 as they don't support any modifiers beside linear. Modifiers
> aware applications can be confused by provided empty modifier list - at
> least linear modifier should be included, but it's not for DE2 and DE3.

Makes sense and it's apparently the norm to not report any modifier blob
when only linear is supported, so let's stick to that.

Note that when the reverted patch was applied, the core didn't set
allow_fb_modifiers on its own yet. But it does now so let's rely on it instead.

Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

Cheers,

Paul

> Fixes: 9db9c0cf5895 ("drm/sun4i: drv: Allow framebuffer modifiers in mode config")
> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
> ---
>  drivers/gpu/drm/sun4i/sun4i_drv.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
> index 5ae67d526b1d..328272ff77d8 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_drv.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
> @@ -85,7 +85,6 @@ static int sun4i_drv_bind(struct device *dev)
>  	}
>  
>  	drm_mode_config_init(drm);
> -	drm->mode_config.allow_fb_modifiers = true;
>  
>  	ret = component_bind_all(drm->dev, drm);
>  	if (ret) {
> -- 
> 2.25.0
>
Maxime Ripard Jan. 27, 2020, 9:43 a.m. UTC | #2
On Mon, Jan 27, 2020 at 09:14:19AM +0100, Paul Kocialkowski wrote:
> Hi Jernej,
>
> On Sun 26 Jan 20, 07:59, Jernej Skrabec wrote:
> > This reverts commit 9db9c0cf5895e4ddde2814360cae7bea9282edd2.
> >
> > Setting mode_config.allow_fb_modifiers manually is completely
> > unnecessary. It is set automatically by drm_universal_plane_init() based
> > on the fact if modifier list is provided or not. Even more, it breaks
> > DE2 and DE3 as they don't support any modifiers beside linear. Modifiers
> > aware applications can be confused by provided empty modifier list - at
> > least linear modifier should be included, but it's not for DE2 and DE3.
>
> Makes sense and it's apparently the norm to not report any modifier blob
> when only linear is supported, so let's stick to that.
>
> Note that when the reverted patch was applied, the core didn't set
> allow_fb_modifiers on its own yet. But it does now so let's rely on it instead.
>
> Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

Applied, thanks!
Maxime

Patch
diff mbox series

diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 5ae67d526b1d..328272ff77d8 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -85,7 +85,6 @@  static int sun4i_drv_bind(struct device *dev)
 	}
 
 	drm_mode_config_init(drm);
-	drm->mode_config.allow_fb_modifiers = true;
 
 	ret = component_bind_all(drm->dev, drm);
 	if (ret) {