patches: Update media Mediatek patch metadata

nathanchance · nathanchance · commit eb5633113ac6 · 2024-12-20T13:28:01.000-07:00
Now that this has been accepted into a subsystem tree and should have a
stable hash, update the patch metadata for tracking purposes.

Signed-off-by: Nathan Chancellor &lt;nathan@kernel.org&gt;
diff --git a/patches/6.1/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch b/patches/6.1/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
@@ -1,12 +1,8 @@
-From git@z Thu Jan  1 00:00:00 1970
-Subject: [PATCH] media: mediatek: vcodec: mark
- vdec_vp9_slice_map_counts_eob_coef noinline
+From 8b55f8818900c99dd4f55a59a103f5b29e41eb2c Mon Sep 17 00:00:00 2001
 From: Arnd Bergmann <arnd@arndb.de>
 Date: Fri, 18 Oct 2024 15:14:42 +0000
-Message-Id: <20241018151448.3694052-1-arnd@kernel.org>
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
+Subject: media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef
+ noinline
 
 With KASAN enabled, clang fails to optimize the inline version of
 vdec_vp9_slice_map_counts_eob_coef() properly, leading to kilobytes
@@ -22,20 +18,19 @@ the problem completely.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Link: https://lore.kernel.org/r/20241018151448.3694052-1-arnd@kernel.org
+Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 ---
-I have not come to a conclusion on how exactly clang fails to do this
-right, but can provide the .config and/or preprocessed source files
-and command line if we think this should be fixed in clang.
+Link: https://git.linuxtv.org/media.git/commit/?id=8b55f8818900c99dd4f55a59a103f5b29e41eb2c
 ---
- .../mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c         | 3 ++-
+ .../media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c  | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c
 index eea709d93820..47c302745c1d 100644
 --- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c
 +++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c
-@@ -1188,7 +1188,8 @@ static int vdec_vp9_slice_setup_lat(struct vdec_vp9_slice_instance *instance,
+@@ -1188,7 +1188,8 @@ err:
  	return ret;
  }
  
@@ -46,5 +41,5 @@ index eea709d93820..47c302745c1d 100644
  					struct vdec_vp9_slice_frame_counts *counts,
  					struct v4l2_vp9_frame_symbol_counts *counts_helper)
 -- 
-2.39.5
+cgit v1.2.3
 
diff --git a/patches/6.1/series b/patches/6.1/series
@@ -1 +1 @@
-20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch
+8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
diff --git a/patches/6.6/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch b/patches/6.6/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
@@ -1,12 +1,8 @@
-From git@z Thu Jan  1 00:00:00 1970
-Subject: [PATCH] media: mediatek: vcodec: mark
- vdec_vp9_slice_map_counts_eob_coef noinline
+From 8b55f8818900c99dd4f55a59a103f5b29e41eb2c Mon Sep 17 00:00:00 2001
 From: Arnd Bergmann <arnd@arndb.de>
 Date: Fri, 18 Oct 2024 15:14:42 +0000
-Message-Id: <20241018151448.3694052-1-arnd@kernel.org>
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
+Subject: media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef
+ noinline
 
 With KASAN enabled, clang fails to optimize the inline version of
 vdec_vp9_slice_map_counts_eob_coef() properly, leading to kilobytes
@@ -22,20 +18,19 @@ the problem completely.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Link: https://lore.kernel.org/r/20241018151448.3694052-1-arnd@kernel.org
+Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 ---
-I have not come to a conclusion on how exactly clang fails to do this
-right, but can provide the .config and/or preprocessed source files
-and command line if we think this should be fixed in clang.
+Link: https://git.linuxtv.org/media.git/commit/?id=8b55f8818900c99dd4f55a59a103f5b29e41eb2c
 ---
- .../mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c         | 3 ++-
+ .../media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c  | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
 index eea709d93820..47c302745c1d 100644
 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
 +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
-@@ -1188,7 +1188,8 @@ static int vdec_vp9_slice_setup_lat(struct vdec_vp9_slice_instance *instance,
+@@ -1188,7 +1188,8 @@ err:
  	return ret;
  }
  
@@ -46,5 +41,5 @@ index eea709d93820..47c302745c1d 100644
  					struct vdec_vp9_slice_frame_counts *counts,
  					struct v4l2_vp9_frame_symbol_counts *counts_helper)
 -- 
-2.39.5
+cgit v1.2.3
 
diff --git a/patches/6.6/series b/patches/6.6/series
@@ -1 +1 @@
-20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch
+8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
diff --git a/patches/arm64-fixes/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch b/patches/arm64-fixes/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
@@ -1,12 +1,8 @@
-From git@z Thu Jan  1 00:00:00 1970
-Subject: [PATCH] media: mediatek: vcodec: mark
- vdec_vp9_slice_map_counts_eob_coef noinline
+From 8b55f8818900c99dd4f55a59a103f5b29e41eb2c Mon Sep 17 00:00:00 2001
 From: Arnd Bergmann <arnd@arndb.de>
 Date: Fri, 18 Oct 2024 15:14:42 +0000
-Message-Id: <20241018151448.3694052-1-arnd@kernel.org>
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
+Subject: media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef
+ noinline
 
 With KASAN enabled, clang fails to optimize the inline version of
 vdec_vp9_slice_map_counts_eob_coef() properly, leading to kilobytes
@@ -22,20 +18,19 @@ the problem completely.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Link: https://lore.kernel.org/r/20241018151448.3694052-1-arnd@kernel.org
+Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 ---
-I have not come to a conclusion on how exactly clang fails to do this
-right, but can provide the .config and/or preprocessed source files
-and command line if we think this should be fixed in clang.
+Link: https://git.linuxtv.org/media.git/commit/?id=8b55f8818900c99dd4f55a59a103f5b29e41eb2c
 ---
- .../mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c         | 3 ++-
+ .../media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c  | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
 index eea709d93820..47c302745c1d 100644
 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
 +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
-@@ -1188,7 +1188,8 @@ static int vdec_vp9_slice_setup_lat(struct vdec_vp9_slice_instance *instance,
+@@ -1188,7 +1188,8 @@ err:
  	return ret;
  }
  
@@ -46,5 +41,5 @@ index eea709d93820..47c302745c1d 100644
  					struct vdec_vp9_slice_frame_counts *counts,
  					struct v4l2_vp9_frame_symbol_counts *counts_helper)
 -- 
-2.39.5
+cgit v1.2.3
 
diff --git a/patches/arm64-fixes/series b/patches/arm64-fixes/series
@@ -1 +1 @@
-20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch
+8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
diff --git a/patches/arm64/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch b/patches/arm64/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
@@ -1,12 +1,8 @@
-From git@z Thu Jan  1 00:00:00 1970
-Subject: [PATCH] media: mediatek: vcodec: mark
- vdec_vp9_slice_map_counts_eob_coef noinline
+From 8b55f8818900c99dd4f55a59a103f5b29e41eb2c Mon Sep 17 00:00:00 2001
 From: Arnd Bergmann <arnd@arndb.de>
 Date: Fri, 18 Oct 2024 15:14:42 +0000
-Message-Id: <20241018151448.3694052-1-arnd@kernel.org>
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
+Subject: media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef
+ noinline
 
 With KASAN enabled, clang fails to optimize the inline version of
 vdec_vp9_slice_map_counts_eob_coef() properly, leading to kilobytes
@@ -22,20 +18,19 @@ the problem completely.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Link: https://lore.kernel.org/r/20241018151448.3694052-1-arnd@kernel.org
+Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 ---
-I have not come to a conclusion on how exactly clang fails to do this
-right, but can provide the .config and/or preprocessed source files
-and command line if we think this should be fixed in clang.
+Link: https://git.linuxtv.org/media.git/commit/?id=8b55f8818900c99dd4f55a59a103f5b29e41eb2c
 ---
- .../mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c         | 3 ++-
+ .../media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c  | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
 index eea709d93820..47c302745c1d 100644
 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
 +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
-@@ -1188,7 +1188,8 @@ static int vdec_vp9_slice_setup_lat(struct vdec_vp9_slice_instance *instance,
+@@ -1188,7 +1188,8 @@ err:
  	return ret;
  }
  
@@ -46,5 +41,5 @@ index eea709d93820..47c302745c1d 100644
  					struct vdec_vp9_slice_frame_counts *counts,
  					struct v4l2_vp9_frame_symbol_counts *counts_helper)
 -- 
-2.39.5
+cgit v1.2.3
 
diff --git a/patches/arm64/series b/patches/arm64/series
@@ -1 +1 @@
-20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch
+8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
diff --git a/patches/mainline/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch b/patches/mainline/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
@@ -1,12 +1,8 @@
-From git@z Thu Jan  1 00:00:00 1970
-Subject: [PATCH] media: mediatek: vcodec: mark
- vdec_vp9_slice_map_counts_eob_coef noinline
+From 8b55f8818900c99dd4f55a59a103f5b29e41eb2c Mon Sep 17 00:00:00 2001
 From: Arnd Bergmann <arnd@arndb.de>
 Date: Fri, 18 Oct 2024 15:14:42 +0000
-Message-Id: <20241018151448.3694052-1-arnd@kernel.org>
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 7bit
+Subject: media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef
+ noinline
 
 With KASAN enabled, clang fails to optimize the inline version of
 vdec_vp9_slice_map_counts_eob_coef() properly, leading to kilobytes
@@ -22,20 +18,19 @@ the problem completely.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Link: https://lore.kernel.org/r/20241018151448.3694052-1-arnd@kernel.org
+Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 ---
-I have not come to a conclusion on how exactly clang fails to do this
-right, but can provide the .config and/or preprocessed source files
-and command line if we think this should be fixed in clang.
+Link: https://git.linuxtv.org/media.git/commit/?id=8b55f8818900c99dd4f55a59a103f5b29e41eb2c
 ---
- .../mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c         | 3 ++-
+ .../media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c  | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
 index eea709d93820..47c302745c1d 100644
 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
 +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
-@@ -1188,7 +1188,8 @@ static int vdec_vp9_slice_setup_lat(struct vdec_vp9_slice_instance *instance,
+@@ -1188,7 +1188,8 @@ err:
  	return ret;
  }
  
@@ -46,5 +41,5 @@ index eea709d93820..47c302745c1d 100644
  					struct vdec_vp9_slice_frame_counts *counts,
  					struct v4l2_vp9_frame_symbol_counts *counts_helper)
 -- 
-2.39.5
+cgit v1.2.3
 
diff --git a/patches/mainline/series b/patches/mainline/series
@@ -1 +1 @@
-20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch
+8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
diff --git a/patches/stable/20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch b/patches/stable/20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch
diff --git a/patches/stable/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch b/patches/stable/8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
@@ -0,0 +1,45 @@
+From 8b55f8818900c99dd4f55a59a103f5b29e41eb2c Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Fri, 18 Oct 2024 15:14:42 +0000
+Subject: media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef
+ noinline
+
+With KASAN enabled, clang fails to optimize the inline version of
+vdec_vp9_slice_map_counts_eob_coef() properly, leading to kilobytes
+of temporary values spilled to the stack:
+
+drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c:1526:12: error: stack frame size (2160) exceeds limit (2048) in 'vdec_vp9_slice_update_prob' [-Werror,-Wframe-larger-than]
+
+This seems to affect all versions of clang including the latest (clang-20),
+but the degree of stack overhead is different per release.
+
+Marking the function as noinline_for_stack is harmless here and avoids
+the problem completely.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Reviewed-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+---
+Link: https://git.linuxtv.org/media.git/commit/?id=8b55f8818900c99dd4f55a59a103f5b29e41eb2c
+---
+ .../media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c  | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
+index eea709d93820..47c302745c1d 100644
+--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
++++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
+@@ -1188,7 +1188,8 @@ err:
+ 	return ret;
+ }
+ 
+-static
++/* clang stack usage explodes if this is inlined */
++static noinline_for_stack
+ void vdec_vp9_slice_map_counts_eob_coef(unsigned int i, unsigned int j, unsigned int k,
+ 					struct vdec_vp9_slice_frame_counts *counts,
+ 					struct v4l2_vp9_frame_symbol_counts *counts_helper)
+-- 
+cgit v1.2.3
+
diff --git a/patches/stable/series b/patches/stable/series
@@ -1,2 +1,2 @@
-20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch
+8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch
 v2_20241121_nathan_hexagon_disable_constant_extender_optimization_for_llvm_prior_to_19_1_0.patch

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch`
	`1`	`+8b55f8818900c99dd4f55a59a103f5b29e41eb2c.patch`