build: update kernel patches

CertainLach · CertainLach · commit cc807d587cb5 · 2023-01-06T22:06:42.000+01:00
Signed-off-by: Yaroslav Bolyukin &lt;iam@lach.pw&gt;
diff --git a/kernel-patches/.dockerignore b/kernel-patches/.dockerignore
@@ -0,0 +1,2 @@
+# I keep cloned kernel source code here
+kernel
diff --git a/kernel-patches/.gitignore b/kernel-patches/.gitignore
@@ -2,3 +2,5 @@ linux.deb
 headers.deb
 linux.pkg.tar.zst
 headers.pkg.tar.zst
+# I keep cloned kernel source code here
+kernel
diff --git a/kernel-patches/0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch b/kernel-patches/0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch
@@ -1,28 +1,30 @@
-drm/edid: Add Vive Cosmos/Vive Pro 2 to non-desktop list
+From 23842246dab6ece6464cc121fe31b6306c959b2a Mon Sep 17 00:00:00 2001
+From: Yaroslav Bolyukin <iam@lach.pw>
+Date: Sun, 30 Oct 2022 18:59:15 +0100
+Subject: [PATCH 1/3] drm/edid: Add Vive Cosmos/Vive Pro 2 to non-desktop list
 
 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
 ---
- drivers/gpu/drm/drm_edid.c | 4 ++-
+ drivers/gpu/drm/drm_edid.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
-index 12893e7be..fdb8f0a6f 100644
+index 3841aba17abd..767a3e3fa6e1 100644
 --- a/drivers/gpu/drm/drm_edid.c
 +++ b/drivers/gpu/drm/drm_edid.c
-@@ -200,9 +200,11 @@ static const struct edid_quirk {
+@@ -205,9 +205,11 @@ static const struct edid_quirk {
  	EDID_QUIRK('V', 'L', 'V', 0x91be, EDID_QUIRK_NON_DESKTOP),
  	EDID_QUIRK('V', 'L', 'V', 0x91bf, EDID_QUIRK_NON_DESKTOP),
-
+ 
 -	/* HTC Vive and Vive Pro VR Headsets */
 +	/* HTC Vive, Vive Cosmos, Vive Pro and Vive Pro 2 VR Headsets */
  	EDID_QUIRK('H', 'V', 'R', 0xaa01, EDID_QUIRK_NON_DESKTOP),
  	EDID_QUIRK('H', 'V', 'R', 0xaa02, EDID_QUIRK_NON_DESKTOP),
 +	EDID_QUIRK('H', 'V', 'R', 0xaa03, EDID_QUIRK_NON_DESKTOP),
 +	EDID_QUIRK('H', 'V', 'R', 0xaa04, EDID_QUIRK_NON_DESKTOP),
-
+ 
  	/* Oculus Rift DK1, DK2, CV1 and Rift S VR Headsets */
  	EDID_QUIRK('O', 'V', 'R', 0x0001, EDID_QUIRK_NON_DESKTOP),
+-- 
+2.38.1
 
-base-commit: 99613159ad749543621da8238acf1a122880144e
---
-2.34.1
diff --git a/kernel-patches/0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch b/kernel-patches/0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch
@@ -1,24 +1,24 @@
-From d0e927d1a8e1dfecc1e4bc66b5f9bb711ef433c6 Mon Sep 17 00:00:00 2001
+From 83939c5f869bab148a970b6326626da80766c464 Mon Sep 17 00:00:00 2001
 From: Yaroslav Bolyukin <iam@lach.pw>
 Date: Sun, 30 Oct 2022 18:59:15 +0100
-Subject: [PATCH 1/2] drm/edid: parse DRM VESA dsc bpp target
+Subject: [PATCH 2/3] drm/edid: parse DRM VESA dsc bpp target
 
 As per DisplayID v2.0 Errata E9 spec "DSC pass-through timing support"
 VESA vendor-specific data block may contain target DSC bits per pixel
 fields
 
 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
 ---
- drivers/gpu/drm/drm_edid.c  | 43 +++++++++++++++++++++++++------------
- include/drm/drm_connector.h |  6 ++++++
+ drivers/gpu/drm/drm_edid.c  | 42 ++++++++++++++++++++++++-------------
+ include/drm/drm_connector.h |  5 +++++
  include/drm/drm_displayid.h |  4 ++++
- 3 files changed, 39 insertions(+), 14 deletions(-)
+ 3 files changed, 37 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
-index b2d61c05f..a17c5916f 100644
+index 767a3e3fa6e1..db6953f0e33b 100644
 --- a/drivers/gpu/drm/drm_edid.c
 +++ b/drivers/gpu/drm/drm_edid.c
-@@ -6277,7 +6277,7 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector,
+@@ -6289,7 +6289,7 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector,
  	if (oui(vesa->oui[0], vesa->oui[1], vesa->oui[2]) != VESA_IEEE_OUI)
  		return;
  
@@ -27,7 +27,7 @@ index b2d61c05f..a17c5916f 100644
  		drm_dbg_kms(connector->dev,
  			    "[CONNECTOR:%d:%s] Unexpected VESA vendor block size\n",
  			    connector->base.id, connector->name);
-@@ -6300,24 +6300,37 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector,
+@@ -6312,24 +6312,37 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector,
  		break;
  	}
  
@@ -78,24 +78,22 @@ index b2d61c05f..a17c5916f 100644
  }
  
  static void drm_update_mso(struct drm_connector *connector,
-@@ -6363,6 +6376,8 @@ static void drm_reset_display_info(struct drm_connector *connector)
- 
+@@ -6376,6 +6389,7 @@ static void drm_reset_display_info(struct drm_connector *connector)
  	info->mso_stream_count = 0;
  	info->mso_pixel_overlap = 0;
-+
+ 	info->max_dsc_bpp = 0;
 +	info->dp_dsc_bpp = 0;
  }
  
  static u32 update_display_info(struct drm_connector *connector,
 diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
-index e641a4725..a2ca0d294 100644
+index 9037f1317aee..c1ca26142975 100644
 --- a/include/drm/drm_connector.h
 +++ b/include/drm/drm_connector.h
-@@ -656,6 +656,12 @@ struct drm_display_info {
- 	 * @mso_pixel_overlap: eDP MSO segment pixel overlap, 0-8 pixels.
+@@ -721,6 +721,11 @@ struct drm_display_info {
+ 	 * monitor's default value is used instead.
  	 */
- 	u8 mso_pixel_overlap;
-+
+ 	u32 max_dsc_bpp;
 +	/**
 +	 * @dp_dsc_bpp: DP Display-Stream-Compression (DSC) timing's target
 +	 * DST bits per pixel in 6.4 fixed point format. 0 means undefined
@@ -105,7 +103,7 @@ index e641a4725..a2ca0d294 100644
  
  int drm_display_info_set_bus_formats(struct drm_display_info *info,
 diff --git a/include/drm/drm_displayid.h b/include/drm/drm_displayid.h
-index 49649eb84..ada2f8e76 100644
+index 49649eb8447e..ada2f8e7681c 100644
 --- a/include/drm/drm_displayid.h
 +++ b/include/drm/drm_displayid.h
 @@ -131,12 +131,16 @@ struct displayid_detailed_timing_block {
@@ -126,5 +124,5 @@ index 49649eb84..ada2f8e76 100644
  
  /* DisplayID iteration */
 -- 
-2.38.0
+2.38.1
 
diff --git a/kernel-patches/0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch b/kernel-patches/0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch
@@ -1,7 +1,7 @@
-From 7ff32d7fe87a88a66227e9d15179a299bde11d3d Mon Sep 17 00:00:00 2001
+From c33583995576e9ac532c4ad9e260324b1c4fa3a3 Mon Sep 17 00:00:00 2001
 From: Yaroslav Bolyukin <iam@lach.pw>
 Date: Sun, 30 Oct 2022 19:04:26 +0100
-Subject: [PATCH 2/2] drm/amd: use fixed dsc bits-per-pixel from edid
+Subject: [PATCH 3/3] drm/amd: use fixed dsc bits-per-pixel from edid
 
 VESA vendor header from DisplayID spec may contain fixed bit per pixel
 rate, it should be respected by drm driver
@@ -15,10 +15,10 @@ Reviewed-by: Wayne Lin <Wayne.Lin@amd.com>
  3 files changed, 7 insertions(+)
 
 diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-index f0b01c8dc..d4fa84fde 100644
+index e47098fa5aac..1c9c4925ed2f 100644
 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
 +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
-@@ -120,6 +120,8 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
+@@ -87,6 +87,8 @@ enum dc_edid_status dm_helpers_parse_edid_caps(
  
  	edid_caps->edid_hdmi = connector->display_info.is_hdmi;
  
@@ -28,7 +28,7 @@ index f0b01c8dc..d4fa84fde 100644
  	if (sad_count <= 0)
  		return result;
 diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-index 38d71b5c1..f2467b642 100644
+index 38d71b5c1f2d..f2467b64268b 100644
 --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
 +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
 @@ -103,6 +103,8 @@ static bool dc_stream_construct(struct dc_stream_state *stream,
@@ -41,7 +41,7 @@ index 38d71b5c1..f2467b642 100644
  	memset(&stream->timing.dsc_cfg, 0, sizeof(stream->timing.dsc_cfg));
  	stream->timing.dsc_cfg.num_slices_h = 0;
 diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
-index ad9041472..741eef518 100644
+index dc78e2404b48..65915a10ab48 100644
 --- a/drivers/gpu/drm/amd/display/dc/dc_types.h
 +++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
 @@ -231,6 +231,9 @@ struct dc_edid_caps {
@@ -55,5 +55,5 @@ index ad9041472..741eef518 100644
  };
  
 -- 
-2.38.0
+2.38.1
 
diff --git a/kernel-patches/Dockerfile.archlinux-kernel b/kernel-patches/Dockerfile.archlinux-kernel
@@ -6,7 +6,7 @@ WORKDIR /home/build
 
 RUN mkdir kernel
 RUN cd kernel && git clone https://anongit.freedesktop.org/git/drm/drm-misc.git -b drm-misc-next --depth=1 archlinux-linux
-COPY config PKGBUILD 0001-drm-edid-non-desktop.patch 0003-drm-edid-dsc-bpp-parse.patch 0004-drm-amd-dsc-bpp-apply.patch kernel/
+COPY config PKGBUILD *.patch kernel/
 
 RUN cd kernel && makepkg --holdver
 RUN cd kernel && mv linux-*-headers-*.pkg.tar.zst headers.pkg.tar.zst && mv linux-*.pkg.tar.zst linux.pkg.tar.zst
diff --git a/kernel-patches/Dockerfile.debian-kernel b/kernel-patches/Dockerfile.debian-kernel
@@ -3,7 +3,7 @@ RUN apt update && apt install -y build-essential linux-source bc kmod cpio flex
 
 RUN git clone https://anongit.freedesktop.org/git/drm/drm-misc.git -b drm-misc-next --depth=1 kernel
 RUN mkdir patches
-COPY 0001-drm-edid-non-desktop.patch 0003-drm-edid-dsc-bpp-parse.patch 0004-drm-amd-dsc-bpp-apply.patch patches/
+COPY *.patch patches/
 RUN cd kernel && git apply ../patches/*
 COPY .config kernel/
 
diff --git a/kernel-patches/PKGBUILD b/kernel-patches/PKGBUILD
@@ -16,9 +16,9 @@ _srcname=archlinux-linux
 source=(
   "$_srcname::git+https://anongit.freedesktop.org/git/drm/drm-misc.git#branch=$_branch"
   config         # the main kernel config file
-  0001-drm-edid-non-desktop.patch
-  0003-drm-edid-dsc-bpp-parse.patch
-  0004-drm-amd-dsc-bpp-apply.patch
+  0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch
+  0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch
+  0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch
 )
 sha256sums=('SKIP'
             'SKIP'
diff --git a/kernel-patches/merged/drm-edid-type-7-timings.patch b/kernel-patches/merged/drm-edid-type-7-timings.patch

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# I keep cloned kernel source code here`
	`2`	`+kernel`