mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge pull request #8306 from heitbaum/kernel66
[LE12] linux: update to 6.6.x
This commit is contained in:
commit
4962456485
@ -29,8 +29,8 @@ case "${LINUX}" in
|
|||||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
PKG_VERSION="6.6"
|
PKG_VERSION="6.6.2"
|
||||||
PKG_SHA256="d926a06c63dd8ac7df3f86ee1ffc2ce2a3b81a2d168484e76b5b389aba8e56d0"
|
PKG_SHA256="73d4f6ad8dd6ac2a41ed52c2928898b7c3f2519ed5dbdb11920209a36999b77e"
|
||||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||||
PKG_PATCH_DIRS="default"
|
PKG_PATCH_DIRS="default"
|
||||||
;;
|
;;
|
||||||
|
@ -1,35 +1,3 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jonas Karlman <jonas@kwiboo.se>
|
|
||||||
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 <jonas@kwiboo.se>
|
|
||||||
---
|
|
||||||
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 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Jonas Karlman <jonas@kwiboo.se>
|
From: Jonas Karlman <jonas@kwiboo.se>
|
||||||
Date: Sun, 3 May 2020 16:51:31 +0000
|
Date: Sun, 3 May 2020 16:51:31 +0000
|
||||||
|
Loading…
x
Reference in New Issue
Block a user