From bcdf67eea1f153b9094130e13cc132b45ad9f34c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 18 Feb 2020 10:10:59 +0100 Subject: [PATCH] 5.4-stable patches added patches: revert-drm-sun4i-drv-allow-framebuffer-modifiers-in-mode-config.patch --- ...framebuffer-modifiers-in-mode-config.patch | 39 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-5.4/revert-drm-sun4i-drv-allow-framebuffer-modifiers-in-mode-config.patch diff --git a/queue-5.4/revert-drm-sun4i-drv-allow-framebuffer-modifiers-in-mode-config.patch b/queue-5.4/revert-drm-sun4i-drv-allow-framebuffer-modifiers-in-mode-config.patch new file mode 100644 index 00000000000..d834ce6312c --- /dev/null +++ b/queue-5.4/revert-drm-sun4i-drv-allow-framebuffer-modifiers-in-mode-config.patch @@ -0,0 +1,39 @@ +From cf913e9683273f2640501094fa63a67e29f437b3 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Sun, 26 Jan 2020 07:59:37 +0100 +Subject: Revert "drm/sun4i: drv: Allow framebuffer modifiers in mode config" + +From: Jernej Skrabec + +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 +Reviewed-by: Paul Kocialkowski +Signed-off-by: Maxime Ripard +Link: https://patchwork.freedesktop.org/patch/msgid/20200126065937.9564-1-jernej.skrabec@siol.net +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/sun4i/sun4i_drv.c | 1 - + 1 file changed, 1 deletion(-) + +--- 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 + } + + drm_mode_config_init(drm); +- drm->mode_config.allow_fb_modifiers = true; + + ret = component_bind_all(drm->dev, drm); + if (ret) { diff --git a/queue-5.4/series b/queue-5.4/series index 88849a64040..31850d897a9 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -58,3 +58,4 @@ arm64-dts-fast-models-fix-fvp-pci-interrupt-map-property.patch kvm-x86-mask-off-reserved-bit-from-db-exception-payload.patch perf-stat-don-t-report-a-null-stalled-cycles-per-insn-metric.patch nfsv4.1-make-cachethis-no-for-writes.patch +revert-drm-sun4i-drv-allow-framebuffer-modifiers-in-mode-config.patch -- 2.47.3