[ipu6-camera-hal] Add intel_ipu6_isys.conf to make ipu6-driver not clobber /dev/video0

commit 42901f7aa30b054eaa04d44ff8400355921567c3 Author: Hans de Goede <hdegoede(a)redhat.com&gt; 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&gt; - 0.0-9.20221112gitcc0b859 +* Mon May 15 2023 Hans de Goede <hdegoede(a)redhat.com&gt; - 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&gt; - 0.0-9.20221112gitcc0b859 - Fix settings for Tiger lake CPU * Wed Mar 22 2023 Kate Hsuan <hpa(a)redhat.com&gt; - 0.0-8.20221112gitcc0b859