diff --git a/PKGBUILDS/pine64/linux-megi/PKGBUILD b/PKGBUILDS/pine64/linux-megi/PKGBUILD index 156a3f36f..acf533406 100644 --- a/PKGBUILDS/pine64/linux-megi/PKGBUILD +++ b/PKGBUILDS/pine64/linux-megi/PKGBUILD @@ -6,7 +6,7 @@ buildarch=8 pkgbase=linux-megi _desc="Megous Kernel" pkgver=6.4.1 -pkgrel=1 +pkgrel=2 arch=('aarch64') url="https://github.com/megous/linux" license=('GPL2') @@ -34,6 +34,7 @@ source=("linux-$_commit.tar.gz::https://github.com/megous/linux/archive/${_commi 'pinetab-accelerometer.patch' '0002-dts-add-pinetab-dev-old-display-panel.patch' 'dts-pinetab-make-audio-routing-consistent-with-pinephone.patch' + 'dts-pinetab-fix-display.patch' # Bootsplash '0002-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch' '0003-revert-fbcon-remove-no-op-fbcon_set_origin.patch' @@ -263,6 +264,7 @@ md5sums=('f2eaa521ceba559e3b61c18ed77a56ca' 'd0fd6bd627223d4c9fc001ffff9df401' '3182f25beb0b76e8abd2e9de8213351d' '60e9d1ccba52bd2634fbe8034b110e36' + '216feaeaf42d3adee3b23e2c96454e4c' 'a31a435ab6cd8e7a47601159d665ce50' 'fed6ae4ac4c3f56178fa4aca6c934d6f' 'ee3fad8e3468bba539a42ee3ed2b488f' diff --git a/PKGBUILDS/pine64/linux-megi/dts-pinetab-fix-display.patch b/PKGBUILDS/pine64/linux-megi/dts-pinetab-fix-display.patch new file mode 100644 index 000000000..df8277a8e --- /dev/null +++ b/PKGBUILDS/pine64/linux-megi/dts-pinetab-fix-display.patch @@ -0,0 +1,32 @@ +From aa1c320dac3dd5a091953e2b7592d470fb71cda2 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Thu, 31 Mar 2022 12:03:36 +0100 +Subject: [PATCH] drm/panel: ilitek-ili9881c: Clean up on mipi_dsi_attach + failure + +mipi_dsi_attach is allowed to fail, and currently the probe +code doesn't clean up (mainly drm_panel_remove) if this happens. + +Add cleanup code on failure. + +Signed-off-by: Dave Stevenson +--- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +index 6e03d9b0be60c..5446b07439f4a 100644 +--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c 2023-07-01 20:46:40.000000000 +0000 ++++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c 2023-08-08 23:47:37.069526508 +0000 +@@ -919,7 +919,10 @@ + dsi->format = MIPI_DSI_FMT_RGB888; + dsi->lanes = 4; + +- return mipi_dsi_attach(dsi); ++ ret = mipi_dsi_attach(dsi); ++ if (ret) ++ drm_panel_remove(&ctx->panel); ++ return ret; + } + + static void ili9881c_dsi_remove(struct mipi_dsi_device *dsi)