From e0b0ee64494453e6155491d1caf418ed2695aa67 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Thu, 25 Apr 2024 17:38:01 +0200 Subject: kernel 6.7.12 hdr update --- SOURCES/0001-amd-hdr.patch | 55 ++++++++++++++++++++++++++++++++++++++++++++++ SPECS/kernel.spec | 5 ++++- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/SOURCES/0001-amd-hdr.patch b/SOURCES/0001-amd-hdr.patch index 87f2978..b6bff65 100644 --- a/SOURCES/0001-amd-hdr.patch +++ b/SOURCES/0001-amd-hdr.patch @@ -2066,3 +2066,58 @@ index 2ed20e6e439bb5..65ee8745e96540 100644 if (plane->funcs->reset) -- 2.43.0 + +From: Joshua Ashton @ 2024-04-10 22:13 UTC (permalink / raw) + To: amd-gfx; +Cc: Joshua Ashton, Harry Wentland, Xaver Hugl, Melissa Wen, Ethan Lee + +The comment here states "no OGAM in DPP since DCN1", yet that is not +true. + +Testing on an RX 7900XTX (dcn32), it actually does exist in hardware and +works fine. +My best guess is the comment is confused with OGAM ROM for DPP, rather +than OGAM RAM. + +I did not test dcn35/351 as I do not have that hardware, but I assume +the same follows there given the seemingly erroneous comment. +Someone at AMD should check that before merging this commit. + +Signed-off-by: Joshua Ashton + +Cc: Harry Wentland +Cc: Xaver Hugl +Cc: Melissa Wen +Cc: Ethan Lee +--- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +index 9aa39bd25be9..94f5d2b5aadf 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +@@ -2098,7 +2098,7 @@ + dc->caps.color.dpp.dgam_rom_for_yuv = 0; + + dc->caps.color.dpp.hw_3d_lut = 1; +- dc->caps.color.dpp.ogam_ram = 0; // no OGAM in DPP since DCN1 ++ dc->caps.color.dpp.ogam_ram = 1; + // no OGAM ROM on DCN2 and later ASICs + dc->caps.color.dpp.ogam_rom_caps.srgb = 0; + dc->caps.color.dpp.ogam_rom_caps.bt2020 = 0; +diff --git a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c b/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c +index 25ac450944e7..708d63cc3f7f 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c +@@ -1858,7 +1858,7 @@ + dc->caps.color.dpp.dgam_rom_for_yuv = 0; + + dc->caps.color.dpp.hw_3d_lut = 1; +- dc->caps.color.dpp.ogam_ram = 0; // no OGAM in DPP since DCN1 ++ dc->caps.color.dpp.ogam_ram = 1; + // no OGAM ROM on DCN301 + dc->caps.color.dpp.ogam_rom_caps.srgb = 0; + dc->caps.color.dpp.ogam_rom_caps.bt2020 = 0; +-- +2.44.0 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 7af7564..853b100 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 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 203%{?buildid}%{?dist} +%define specrelease 204%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.12 @@ -4002,6 +4002,9 @@ fi\ # # %changelog +* Thu Apr 25 2024 Jan200101 - 6.7.12-204.fsync.1 +- kernel-fsync v6.7.12 hdr update + * Sat Apr 20 2024 Jan200101 - 6.7.12-203.fsync - kernel-fsync v6.7.12 update -- cgit v1.2.3