bump package release so the pipeline won't scream :D

Update checksum
Merge branch pmaports:master into pixel3a-imx363wip
2024-09-29 22:37:09 -05:00 · 2024-09-29 22:35:55 -05:00 · 2024-09-30 03:26:14 +00:00 · 2024-09-21 18:49:27 -05:00 · 2024-09-21 18:40:34 -05:00 · 2024-09-21 23:33:58 +00:00
3 changed files with 50 additions and 6 deletions
@@ -0,0 +1,41 @@
+From 82f88e88db681e24b11913b01ec336cb527f6441 Mon Sep 17 00:00:00 2001
+From: Joel Selvaraj <foss@joelselvaraj.com>
+Date: Thu, 15 Aug 2024 01:40:59 -0500
+Subject: [PATCH] HACK: media: camss: fix crash on stop streaming
+
+My hunch (not tested) is that, the following patch series [1] probably
+changed the logic of enabling and disabling stream and that caused the
+issue. Skipping the use_count check works fine. But not sure if it is the
+correct way to fix it and thus marked as HACK.
+
+[1] https://patchwork.kernel.org/project/linux-media/cover/20240416-enable-streams-impro-v4-0-1d370c9c2b6d@ideasonboard.com/
+
+Signed-off-by: Joel Selvaraj <foss@joelselvaraj.com>
+---
+ drivers/media/platform/qcom/camss/camss-video.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
+index 54cd82f74115..9057247dab7b 100644
+--- a/drivers/media/platform/qcom/camss/camss-video.c
+++ b/drivers/media/platform/qcom/camss/camss-video.c
+@@ -557,11 +557,11 @@ static void video_stop_streaming(struct vb2_queue *q)
+ 
+ 		ret = v4l2_subdev_call(subdev, video, s_stream, 0);
+ 
+-		if (entity->use_count > 1) {
+-			/* Don't stop if other instances of the pipeline are still running */
+-			dev_dbg(video->camss->dev, "Video pipeline still used, don't stop streaming.\n");
+-			return;
+-		}
+		// if (entity->use_count > 1) {
+		// 	/* Don't stop if other instances of the pipeline are still running */
+		// 	dev_dbg(video->camss->dev, "Video pipeline still used, don't stop streaming.\n");
+		// 	return;
+		// }
+ 
+ 		if (ret) {
+ 			dev_err(video->camss->dev, "Video pipeline stop failed: %d\n", ret);
+-- 
+2.46.0
+
@@ -5,11 +5,11 @@
 _flavor="postmarketos-qcom-sdm670"
 pkgname=linux-$_flavor
 pkgver=6.10.2
-pkgrel=2
+pkgrel=5
 pkgdesc="Mainline Kernel fork for SDM670 devices"
 arch="aarch64"
 _carch="arm64"
-url="https://gitlab.com/sdm670-mainline/linux"
+url="https://gitlab.com/panpanpanpan/linux"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps
 	pmb:cross-native
@@ -27,11 +27,12 @@ makedepends="
 "

 _config="config-$_flavor.$arch"
-_tag="sdm670-v$pkgver"
+_tag="imx363-sdm670-v$pkgver"

 # Source
 source="
-	https://gitlab.com/sdm670-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz
+	https://gitlab.com/panpanpanpan/linux/-/archive/$_tag/linux-$_tag.tar.gz
+	0001-HACK-media-camss-fix-crash-on-stop-streaming.patch
 	$_config
 "
 builddir="$srcdir/linux-$_tag"
@@ -66,6 +67,7 @@ package() {
 }

 sha512sums="
-b992e72c8a8f2186088afb427acb8b79760ddb6350087abe15c0ac6064d10bd77adb2c3e260cf3f2014f93dd4b9fafd3f5a9805e9905cf75907e53a1f672dc36  linux-sdm670-v6.10.2.tar.gz
-b42f289628a1e92f0939ceaf4a3a1a3c4832fb122bd35043190b8a12360257796e41c81ab2d5cc26b7c50201d15723069a37e9ad78b9ca32281ce83164abc172  config-postmarketos-qcom-sdm670.aarch64
+c42e30e0a3ec198ea796b7bfe15da9cdc9de1634d727591ed53bb13249b7b9dc19d0489f2dd0ede5d4a8a3123f80ab09e5570d24277abb767d9926afa358cbb0  linux-imx363-sdm670-v6.10.2.tar.gz
+72c92776552f85e0bfade63473324af9dcd944e9162fbc05f26e43d192ddbdb9a4c2daaead5f42c54a564a91c68678f4a111cdf802bac7b60c7fc57f8af99f9b  0001-HACK-media-camss-fix-crash-on-stop-streaming.patch
+7b22161f839461fdc058b4e2cef65c724a48069bc370ee31dd310ad64e6272c87c11ac60bfcab5b81b48b353f818a514a8c0a53178536b163fb4be54349ffaf0  config-postmarketos-qcom-sdm670.aarch64
 "
@@ -3735,6 +3735,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_IMX334 is not set
 # CONFIG_VIDEO_IMX335 is not set
 CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_IMX363=m
 # CONFIG_VIDEO_IMX412 is not set
 # CONFIG_VIDEO_IMX415 is not set
 # CONFIG_VIDEO_MT9M001 is not set
Author	SHA1	Message	Date
panpanpanpan	bc4e226b72	bump package release so the pipeline won't scream :D	2024-09-29 22:37:09 -05:00
panpanpanpan	cfc91a33d5	Update checksum	2024-09-29 22:35:55 -05:00
Pan Ortiz	50195cadc8	Merge branch pmaports:master into pixel3a-imx363wip	2024-09-30 03:26:14 +00:00
panpanpanpan	cdeb67d772	Will this work without this? O:	2024-09-21 18:49:27 -05:00
panpanpanpan	00d61d913c	Fix the other mess i've made	2024-09-21 18:40:34 -05:00
Pan Ortiz	396a2a1d56	Fix the mess i've made	2024-09-21 23:33:58 +00:00
Pan Ortiz	3d99c5db01	Revert "postmarketos-base-ui-gnome-mobile: replace portofolio with nautilus" This reverts commit `70369c873e`	2024-09-21 23:27:28 +00:00
panpanpanpan	92d9347060	Bump package release	2024-09-21 18:20:52 -05:00
panpanpanpan	48335b4ede	fix gitlab source and fix commit	2024-09-21 18:20:46 -05:00
panpanpanpan	12c0ad1553	linux-postmarketos-qcom-sdm670: use imx363 branch Signed-off-by: panpanpanpan <panjeoc@proton.me>	2024-09-21 18:20:15 -05:00
Robert Mader	505202bf71	linux-postmarketos-qcom-sdm670: add camss patch from sdm845 Fixing a crash on stop streaming (cherry picked from commit b7401f94fb536f557f24e4274301bcd331b1738c) Signed-off-by: panpanpanpan <panjeoc@proton.me>	2024-09-21 18:19:58 -05:00
panpanpanpan	70369c873e	postmarketos-base-ui-gnome-mobile: replace portofolio with nautilus We need to add nautilus as in gnome 47 is the new file picker, and without it the file picker won't work, the issues that made nautilus unsuitable for mobile are already fixed, so i think is a good time to use it by default (replacing portfolio as i don't think is a good idea to have two file managers)	2024-09-21 14:02:23 -05:00