[ipu6-camera-hal/f37: 8/8] Merge remote-tracking branch 'origin/master' into f37
by jwrdegoede
commit 9bde7eb58885e5e017e0d84949a506a78e6dea60
Merge: 78ddfb2 42901f7
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon May 15 13:07:18 2023 +0200
Merge remote-tracking branch 'origin/master' into f37
intel_ipu6_isys.conf | 3 +++
ipu6-camera-hal.spec | 14 +++++++++++++-
v4l2-relayd-tgl | 2 +-
3 files changed, 17 insertions(+), 2 deletions(-)
---
1 year, 6 months
[ipu6-camera-hal/f37] (8 commits) ...Merge remote-tracking branch 'origin/master' into f37
by jwrdegoede
Summary of changes:
9356be6... IPU6 camera hal library (*)
0eb032a... udev rules for v4l2-relayd. (*)
2bc9c38... 1. add v4l2-relayd configuration examples. (*)
62761ec... Include the environment file symbolic link /etc/v4l2-relayd (*)
c396e6b... Revert "Include the environment file symbolic link /etc/v4l (*)
a18f7b3... Fix settings for Tiger lake CPU (*)
42901f7... Add intel_ipu6_isys.conf to make ipu6-driver not clobber /d (*)
9bde7eb... Merge remote-tracking branch 'origin/master' into f37
(*) This commit already existed in another branch; no separate mail sent
1 year, 6 months
[ipu6-camera-hal/f38: 8/8] Merge remote-tracking branch 'origin/master' into f38
by jwrdegoede
commit ebda8797b2ea5e764e718ed7ee6930740e990b04
Merge: 194e19c 42901f7
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon May 15 13:05:38 2023 +0200
Merge remote-tracking branch 'origin/master' into f38
intel_ipu6_isys.conf | 3 +++
ipu6-camera-hal.spec | 11 ++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
---
1 year, 6 months
[ipu6-camera-hal/f38] (8 commits) ...Merge remote-tracking branch 'origin/master' into f38
by jwrdegoede
Summary of changes:
9356be6... IPU6 camera hal library (*)
0eb032a... udev rules for v4l2-relayd. (*)
2bc9c38... 1. add v4l2-relayd configuration examples. (*)
62761ec... Include the environment file symbolic link /etc/v4l2-relayd (*)
c396e6b... Revert "Include the environment file symbolic link /etc/v4l (*)
a18f7b3... Fix settings for Tiger lake CPU (*)
42901f7... Add intel_ipu6_isys.conf to make ipu6-driver not clobber /d (*)
ebda879... Merge remote-tracking branch 'origin/master' into f38
(*) This commit already existed in another branch; no separate mail sent
1 year, 6 months
[ipu6-camera-hal] Add intel_ipu6_isys.conf to make ipu6-driver not clobber /dev/video0
by jwrdegoede
commit 42901f7aa30b054eaa04d44ff8400355921567c3
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon May 15 13:04:28 2023 +0200
Add intel_ipu6_isys.conf to make ipu6-driver not clobber /dev/video0
intel_ipu6_isys.conf | 3 +++
ipu6-camera-hal.spec | 13 +++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/intel_ipu6_isys.conf b/intel_ipu6_isys.conf
new file mode 100644
index 0000000..cf290c8
--- /dev/null
+++ b/intel_ipu6_isys.conf
@@ -0,0 +1,3 @@
+# Move the special isys /dev/video# node out of the way of
+# normal v4l2 devices such as v4l2loopback
+options intel_ipu6_isys video_nr=7
diff --git a/ipu6-camera-hal.spec b/ipu6-camera-hal.spec
index 0c23575..dffe5ac 100644
--- a/ipu6-camera-hal.spec
+++ b/ipu6-camera-hal.spec
@@ -9,13 +9,14 @@ Name: ipu6-camera-hal
Summary: Hardware abstraction layer for Intel IPU6
URL: https://github.com/intel/ipu6-camera-hal
Version: 0.0
-Release: 9.%{commitdate}git%{shortcommit}%{?dist}
+Release: 10.%{commitdate}git%{shortcommit}%{?dist}
License: Apache-2.0
Source0: https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}...
Source1: 60-intel-ipu6.rules
Source2: v4l2-relayd-adl
Source3: v4l2-relayd-tgl
+Source4: intel_ipu6_isys.conf
Patch1: 0001-Fix-build-error-due-to-missing-cstdint.h.patch
@@ -85,6 +86,10 @@ sed -i -e "s|}/lib64|}/lib64/ipu6|" %{buildroot}%{_libdir}/pkgconfig/libcamhal.p
install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/defaults/etc/ipu6ep/v4l2-relayd
install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/defaults/etc/ipu6/v4l2-relayd
+# Make kmod-intel-ipu6 use /dev/video7 leaving /dev/video0 for loopback
+install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_modprobedir}/intel_ipu6_isys.conf
+
+
%post
/usr/bin/udevadm control --reload
/usr/bin/udevadm trigger /sys/devices/pci0000:00/0000:00:05.0
@@ -95,6 +100,7 @@ install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/defaults/etc/ipu6/v4l2-
%{_libdir}/*/libcamhal.so
%{_libdir}/libcamhal.so
%{_datadir}/defaults/etc/*
+%{_modprobedir}/intel_ipu6_isys.conf
%{_udevrulesdir}/60-intel-ipu6.rules
@@ -104,7 +110,10 @@ install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/defaults/etc/ipu6/v4l2-
%changelog
-*Mon May 08 2023 Kate Hsuan <hpa(a)redhat.com> - 0.0-9.20221112gitcc0b859
+* Mon May 15 2023 Hans de Goede <hdegoede(a)redhat.com> - 0.0-10.20221112gitcc0b859
+- Add intel_ipu6_isys.conf to make ipu6-driver not clobber /dev/video0
+
+* Mon May 08 2023 Kate Hsuan <hpa(a)redhat.com> - 0.0-9.20221112gitcc0b859
- Fix settings for Tiger lake CPU
* Wed Mar 22 2023 Kate Hsuan <hpa(a)redhat.com> - 0.0-8.20221112gitcc0b859
1 year, 6 months
[v4l2loopback-kmod/f37] (5 commits) ...Add the patch file
by jwrdegoede
Summary of changes:
c0e351a... debug_package fix (*)
671c396... Fix aarch64 on rhel9 (*)
cea6e18... Update version to a66968647843f57448b59cf98d0318f1e98e072c (*)
08df8d8... - Updated to commit 2c9b67072b15d903fecde67c7f269abeafee4c2 (*)
67d610b... Add the patch file (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 6 months
[v4l2loopback-kmod/f38: 4/4] Merge remote-tracking branch 'origin/master' into f38
by jwrdegoede
commit ac7e2a9d173616b900dac481e6f86b69dc636181
Merge: 5af2b7e 67d610b
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon May 15 11:37:25 2023 +0200
Merge remote-tracking branch 'origin/master' into f38
...k-Fixup-bytesused-field-when-writer-sends.patch | 106 +++++++++++++++++++++
sources | 2 +-
v4l2loopback-kmod.spec | 14 ++-
3 files changed, 119 insertions(+), 3 deletions(-)
---
1 year, 6 months