mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 15:07:49 +00:00
Merge pull request #4182 from jernejsk/lima
Allwinner: Use lima for mali400
This commit is contained in:
commit
cf93b15473
@ -38,7 +38,7 @@
|
||||
KERNEL_TARGET="zImage"
|
||||
|
||||
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
|
||||
OPENGLES="libmali"
|
||||
OPENGLES="mesa"
|
||||
|
||||
# Mali GPU family
|
||||
MALI_FAMILY="400"
|
||||
|
@ -32,7 +32,7 @@
|
||||
ATF_PLATFORM="sun50i_a64"
|
||||
|
||||
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
|
||||
OPENGLES="libmali"
|
||||
OPENGLES="mesa"
|
||||
|
||||
# Mali GPU family
|
||||
MALI_FAMILY="400"
|
||||
|
@ -38,7 +38,7 @@
|
||||
KERNEL_TARGET="zImage"
|
||||
|
||||
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
|
||||
OPENGLES="libmali"
|
||||
OPENGLES="mesa"
|
||||
|
||||
# Mali GPU family
|
||||
MALI_FAMILY="400"
|
||||
|
@ -3469,7 +3469,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
|
||||
CONFIG_DRM_GEM_CMA_HELPER=y
|
||||
CONFIG_DRM_KMS_CMA_HELPER=y
|
||||
CONFIG_DRM_GEM_SHMEM_HELPER=y
|
||||
CONFIG_DRM_SCHED=y
|
||||
CONFIG_DRM_SCHED=m
|
||||
|
||||
#
|
||||
# I2C encoder or helper chips
|
||||
@ -3574,8 +3574,8 @@ CONFIG_DRM_DW_HDMI_CEC=y
|
||||
# CONFIG_TINYDRM_ST7586 is not set
|
||||
# CONFIG_TINYDRM_ST7735R is not set
|
||||
# CONFIG_DRM_PL111 is not set
|
||||
# CONFIG_DRM_LIMA is not set
|
||||
CONFIG_DRM_PANFROST=y
|
||||
CONFIG_DRM_LIMA=m
|
||||
CONFIG_DRM_PANFROST=m
|
||||
# CONFIG_DRM_LEGACY is not set
|
||||
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
|
||||
|
||||
|
@ -3393,6 +3393,8 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
|
||||
# CONFIG_DRM_DP_CEC is not set
|
||||
CONFIG_DRM_GEM_CMA_HELPER=y
|
||||
CONFIG_DRM_KMS_CMA_HELPER=y
|
||||
CONFIG_DRM_GEM_SHMEM_HELPER=y
|
||||
CONFIG_DRM_SCHED=m
|
||||
|
||||
#
|
||||
# I2C encoder or helper chips
|
||||
@ -3497,7 +3499,7 @@ CONFIG_DRM_DW_HDMI_CEC=y
|
||||
# CONFIG_TINYDRM_ST7735R is not set
|
||||
# CONFIG_DRM_PL111 is not set
|
||||
# CONFIG_DRM_TVE200 is not set
|
||||
# CONFIG_DRM_LIMA is not set
|
||||
CONFIG_DRM_LIMA=m
|
||||
# CONFIG_DRM_PANFROST is not set
|
||||
# CONFIG_DRM_MCDE is not set
|
||||
# CONFIG_DRM_LEGACY is not set
|
||||
|
@ -46,7 +46,7 @@
|
||||
# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
|
||||
# Space separated list is supported,
|
||||
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
|
||||
GRAPHIC_DRIVERS="panfrost"
|
||||
GRAPHIC_DRIVERS="lima panfrost"
|
||||
|
||||
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
|
||||
# Space separated list is supported,
|
||||
|
@ -0,0 +1,39 @@
|
||||
From cf913e9683273f2640501094fa63a67e29f437b3 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"
|
||||
|
||||
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
|
||||
---
|
||||
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 a5757b11b730..5b54eff12cc0 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
|
||||
|
Loading…
x
Reference in New Issue
Block a user