| From 3f47887da38ce108262f41f880179f8607d13c7f Mon Sep 17 00:00:00 2001 |
| From: Jernej Skrabec <jernej.skrabec@siol.net> |
| Date: Sun, 26 Jan 2020 07:59:37 +0100 |
| Subject: [PATCH] Revert "drm/sun4i: drv: Allow framebuffer modifiers in mode |
| config" |
| |
| commit cf913e9683273f2640501094fa63a67e29f437b3 upstream. |
| |
| 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> |
| Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> |
| Signed-off-by: Maxime Ripard <maxime@cerno.tech> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20200126065937.9564-1-jernej.skrabec@siol.net |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c |
| index 3ff73998d841..344e6a29ef17 100644 |
| --- a/drivers/gpu/drm/sun4i/sun4i_drv.c |
| +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c |
| @@ -96,7 +96,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.7.4 |
| |
