diff --git a/packages/linux/package.mk b/packages/linux/package.mk index c4dd010b89..b41292e67b 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}" case "${LINUX}" in amlogic) - PKG_VERSION="6449a0ba6843fe70523eeb7855984054f36f6d24" # 6.1.19 - PKG_SHA256="6a46c7b91028157d56437736cc8601fa46485e6f52bd6983e92ff80f17aa3065" + PKG_VERSION="316071de521e96bc0f7e928e3d20508891961fa4" # 6.1.28 + PKG_SHA256="3b5968c3603f19dfd4201c5f2ce60a98fb2294c1845f44826218006c86788923" PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="default" diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch deleted file mode 100644 index 06834480de..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From eb87fb2d9f172769fadab83e148d3138c2a2031b Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Wed, 1 Mar 2023 12:48:28 +0000 -Subject: [PATCH 013/120] FROMGIT(FIXES): drm/meson: fix 1px pink line on GXM - when scaling video overlay - -Playing media with a resolution smaller than the crtc size requires the -video overlay to be scaled for output and GXM boards display a 1px pink -line on the bottom of the scaled overlay. Comparing with the downstream -vendor driver revealed VPP_DUMMY_DATA not being set [0]. - -Setting VPP_DUMMY_DATA prevents the 1px pink line from being seen. - -[0] https://github.com/endlessm/linux-s905x/blob/master/drivers/amlogic/amports/video.c#L7869 - -Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") -Suggested-by: Martin Blumenstingl -Signed-off-by: Christian Hewitt ---- - drivers/gpu/drm/meson/meson_vpp.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/gpu/drm/meson/meson_vpp.c b/drivers/gpu/drm/meson/meson_vpp.c -index 154837688ab0..5df1957c8e41 100644 ---- a/drivers/gpu/drm/meson/meson_vpp.c -+++ b/drivers/gpu/drm/meson/meson_vpp.c -@@ -100,6 +100,8 @@ void meson_vpp_init(struct meson_drm *priv) - priv->io_base + _REG(VPP_DOLBY_CTRL)); - writel_relaxed(0x1020080, - priv->io_base + _REG(VPP_DUMMY_DATA1)); -+ writel_relaxed(0x42020, -+ priv->io_base + _REG(VPP_DUMMY_DATA)); - } else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) - writel_relaxed(0xf, priv->io_base + _REG(DOLBY_PATH_CTRL)); - --- -2.34.1 -