From b2dc0efa7543d3c8cd3aefd8bc4004bd840a9074 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 9 Nov 2023 13:12:20 +0000 Subject: [PATCH 1/2] linux: update to 6.6.2 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 1cf59d2bda..a46651f50f 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -29,8 +29,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; *) - PKG_VERSION="6.6" - PKG_SHA256="d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0" + PKG_VERSION="6.6.2" + PKG_SHA256="73d4f6ad8dd6ac2a41ed52c2928898b7c3f2519ed5dbdb11920209a36999b77e" PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;; From 259a1e2ebe5acc7031d4534f9c314efd4f92b421 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 17 Nov 2023 21:22:38 +0000 Subject: [PATCH 2/2] linux (Rockchip): drop patches upstreamed in 6.6.2 --- .../default/linux-1000-drm-rockchip.patch | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch index c9f4232b06..c4d56a8781 100644 --- a/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch +++ b/projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch @@ -1,35 +1,3 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Wed, 15 Jul 2020 15:24:47 +0000 -Subject: [PATCH] drm/rockchip: vop: fix crtc duplicate state - -struct rockchip_crtc_state owned members is always reset to zero in -the atomic_duplicate_state callback. -Fix this by using kmemdup on the subclass state structure. - -Signed-off-by: Jonas Karlman ---- - drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index 9e71263ac770..dbe4d411b30f 100644 ---- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -@@ -1637,7 +1637,11 @@ static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc) - if (WARN_ON(!crtc->state)) - return NULL; - -- rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL); -+ if (WARN_ON(!crtc->state)) -+ return NULL; -+ -+ rockchip_state = kmemdup(to_rockchip_crtc_state(crtc->state), -+ sizeof(*rockchip_state), GFP_KERNEL); - if (!rockchip_state) - return NULL; - - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 3 May 2020 16:51:31 +0000