jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 07:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4182 from jernejsk/lima

Browse Source 
Allwinner: Use lima for mali400
This commit is contained in:
Matthias Reichl 2020-02-10 17:11:50 +01:00 committed by GitHub
commit cf93b15473
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/Allwinner/devices/A20/options
View File

@ -38,7 +38,7 @@
KERNEL_TARGET="zImage" KERNEL_TARGET="zImage"
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
OPENGLES="libmali" OPENGLES="mesa"
# Mali GPU family # Mali GPU family
MALI_FAMILY="400" MALI_FAMILY="400"

2
projects/Allwinner/devices/A64/options
View File

@ -32,7 +32,7 @@
ATF_PLATFORM="sun50i_a64" ATF_PLATFORM="sun50i_a64"
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
OPENGLES="libmali" OPENGLES="mesa"
# Mali GPU family # Mali GPU family
MALI_FAMILY="400" MALI_FAMILY="400"

2
projects/Allwinner/devices/H3/options
View File

@ -38,7 +38,7 @@
KERNEL_TARGET="zImage" KERNEL_TARGET="zImage"
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
OPENGLES="libmali" OPENGLES="mesa"
# Mali GPU family # Mali GPU family
MALI_FAMILY="400" MALI_FAMILY="400"

6
projects/Allwinner/linux/linux.aarch64.conf
View File

@ -3469,7 +3469,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_GEM_CMA_HELPER=y
CONFIG_DRM_KMS_CMA_HELPER=y CONFIG_DRM_KMS_CMA_HELPER=y
CONFIG_DRM_GEM_SHMEM_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=y
CONFIG_DRM_SCHED=y CONFIG_DRM_SCHED=m
# #
# I2C encoder or helper chips # I2C encoder or helper chips
@ -3574,8 +3574,8 @@ CONFIG_DRM_DW_HDMI_CEC=y
# CONFIG_TINYDRM_ST7586 is not set # CONFIG_TINYDRM_ST7586 is not set
# CONFIG_TINYDRM_ST7735R is not set # CONFIG_TINYDRM_ST7735R is not set
# CONFIG_DRM_PL111 is not set # CONFIG_DRM_PL111 is not set
# CONFIG_DRM_LIMA is not set CONFIG_DRM_LIMA=m
CONFIG_DRM_PANFROST=y CONFIG_DRM_PANFROST=m
# CONFIG_DRM_LEGACY is not set # CONFIG_DRM_LEGACY is not set
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y

4
projects/Allwinner/linux/linux.arm.conf
View File

@ -3393,6 +3393,8 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
# CONFIG_DRM_DP_CEC is not set # CONFIG_DRM_DP_CEC is not set
CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_GEM_CMA_HELPER=y
CONFIG_DRM_KMS_CMA_HELPER=y CONFIG_DRM_KMS_CMA_HELPER=y
CONFIG_DRM_GEM_SHMEM_HELPER=y
CONFIG_DRM_SCHED=m
# #
# I2C encoder or helper chips # I2C encoder or helper chips
@ -3497,7 +3499,7 @@ CONFIG_DRM_DW_HDMI_CEC=y
# CONFIG_TINYDRM_ST7735R is not set # CONFIG_TINYDRM_ST7735R is not set
# CONFIG_DRM_PL111 is not set # CONFIG_DRM_PL111 is not set
# CONFIG_DRM_TVE200 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_PANFROST is not set
# CONFIG_DRM_MCDE is not set # CONFIG_DRM_MCDE is not set
# CONFIG_DRM_LEGACY is not set # CONFIG_DRM_LEGACY is not set

2
projects/Allwinner/options
View File

@ -46,7 +46,7 @@
# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia) # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
# Space separated list is supported, # Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia" # 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) # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported, # Space separated list is supported,

39
projects/Allwinner/patches/linux/0002-backport-from-5.7.patch Normal file
View File

@ -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