meson: edge: Bump v6.4

2025-09-24 19:47:06 +07:00 · 2023-07-05 13:22:36 +08:00
parent 8659f4a345
commit 12ab63f0a2
8 changed files with 5 additions and 5 deletions
--- a/config/sources/families/include/meson_common.inc
+++ b/config/sources/families/include/meson_common.inc
@@ -54,8 +54,8 @@ case $BRANCH in

 	edge)

-		declare -g KERNEL_MAJOR_MINOR="6.3" # Major and minor versions of this kernel.
-		KERNELBRANCH="branch:linux-6.3.y"
+		declare -g KERNEL_MAJOR_MINOR="6.4" # Major and minor versions of this kernel.
+		KERNELBRANCH="branch:linux-6.4.y"
 		KERNELPATCHDIR='meson-'$BRANCH

 		;;
--- a/patch/kernel/archive/meson-6.4/generic-0001-m8-m8b-m8m2-Support-HDMI.patch
+++ b/patch/kernel/archive/meson-6.4/generic-0001-m8-m8b-m8m2-Support-HDMI.patch
@@ -884,7 +884,7 @@ index 3b24a924b7b..091c670ab0e 100644
 +	else
 +		preferred_bpp = 32;
 +
-+	drm_fbdev_generic_setup(priv->drm, preferred_bpp);
+	drm_fbdev_dma_setup(priv->drm, preferred_bpp);
 }
 
 struct meson_drm_soc_attr {
@@ -1102,7 +1102,7 @@ index 3b24a924b7b..091c670ab0e 100644
 	if (ret)
 		goto uninstall_irq;
 
-	drm_fbdev_generic_setup(drm, 32);
+-	drm_fbdev_dma_setup(drm, 32);
 +	meson_fbdev_setup(priv);
 
 	return 0;
--- a/patch/kernel/archive/meson-6.4/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch
+++ b/patch/kernel/archive/meson-6.4/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch
--- a/patch/kernel/archive/meson-6.4/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch
+++ b/patch/kernel/archive/meson-6.4/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch
--- a/patch/kernel/archive/meson-6.4/odroidc1-dts-Enable-HDMI.patch
+++ b/patch/kernel/archive/meson-6.4/odroidc1-dts-Enable-HDMI.patch
--- a/patch/kernel/archive/meson-6.4/onecloud-0001-add-dts.patch
+++ b/patch/kernel/archive/meson-6.4/onecloud-0001-add-dts.patch
--- a/patch/kernel/archive/meson-6.4/onecloud-0002-dts-Support-HDMI.patch
+++ b/patch/kernel/archive/meson-6.4/onecloud-0002-dts-Support-HDMI.patch
--- a/patch/kernel/meson-edge
+++ b/patch/kernel/meson-edge
@@ -1 +1 @@
-archive/meson-6.3
+archive/meson-6.4