aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan200101 <sentrycraft123@gmail.com>2023-12-17 14:21:52 +0100
committerJan200101 <sentrycraft123@gmail.com>2023-12-17 14:21:52 +0100
commitf7fd1aa1c91ea6cda3a8185f98de06d8b854dd6d (patch)
tree8780875ebf25bf39f3420f5e9e3a54089a195fb4
parent929b45c9f7cf3ac99a35400b89ee7396bee52e52 (diff)
downloadkernel-fsync-f7fd1aa1c91ea6cda3a8185f98de06d8b854dd6d.tar.gz
kernel-fsync-f7fd1aa1c91ea6cda3a8185f98de06d8b854dd6d.zip
kernel 6.6.7 fix patch
-rw-r--r--SOURCES/0001-amd-hdr.patch25
-rw-r--r--SPECS/kernel.spec5
2 files changed, 29 insertions, 1 deletions
diff --git a/SOURCES/0001-amd-hdr.patch b/SOURCES/0001-amd-hdr.patch
index 6c0deff..3d9feaa 100644
--- a/SOURCES/0001-amd-hdr.patch
+++ b/SOURCES/0001-amd-hdr.patch
@@ -2120,3 +2120,28 @@ index ea1b639bc..cea5653e4 100644
--
2.43.0
+From b938468f07222b4faab5ae5cf5391eccd9532bb0 Mon Sep 17 00:00:00 2001
+From: Bouke Sybren Haarsma <boukehaarsma23@gmail.com>
+Date: Fri, 15 Dec 2023 11:14:58 +0100
+Subject: [PATCH] Don't create color_mgmt_properties on asics < SIENNA_CICHLID
+
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+index 2ed20e6e439bb5..65ee8745e96540 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+@@ -1742,7 +1742,8 @@ int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm,
+ drm_plane_helper_add(plane, &dm_plane_helper_funcs);
+
+ #ifdef CONFIG_DRM_AMD_COLOR_STEAMDECK
+- dm_atomic_plane_attach_color_mgmt_properties(dm, plane);
++ if (dm->adev->asic_type >= CHIP_SIENNA_CICHLID)
++ dm_atomic_plane_attach_color_mgmt_properties(dm, plane);
+ #endif
+ /* Create (reset) the plane state */
+ if (plane->funcs->reset)
+--
+2.43.0
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index e773731..d1b5cc7 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -169,7 +169,7 @@ Summary: The Linux kernel
# This is needed to do merge window version magic
%define patchlevel 6
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 202%{?buildid}%{?dist}
+%define specrelease 203%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.6.7
@@ -3832,6 +3832,9 @@ fi\
#
#
%changelog
+* Sun Dec 17 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.6.7-203.fsync.1
+- readd patch
+
* Sun Dec 17 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.6.7-202.fsync.1
- revert patch