Skip to content

Commit 6604868

Browse files
remibettanremibettan
committed
Merge branch 'd436' into d436_rebased_2025_05_19
D436 rebased to dev
2 parents f9aa4a8 + 155a6ba commit 6604868

20 files changed

+283
-269
lines changed

‎common/device-model.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@ namespace rs2
267267

268268
auto dev_name = get_device_name(dev);
269269

270-
if( ( dev.is<update_device>() || is_upgradeable( fw, recommended_fw_ver) ) )
270+
// TODO - D436. Don't suggest to update FW as it doesn't support D436. Revert after next release with bundle supporting FW
271+
if( ( dev.is<update_device>() || is_upgradeable( fw, recommended_fw_ver) ) && pid != "1156") //0x1156 is pid for D436
271272
{
272273
std::stringstream msg;
273274

‎config/99-realsense-libusb.rules

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="0b68", MODE:="066
4040
SUBSYSTEMS=="usb", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="0b6a", MODE:="0666", GROUP:="plugdev"
4141
SUBSYSTEMS=="usb", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="0b6b", MODE:="0666", GROUP:="plugdev"
4242
SUBSYSTEMS=="usb", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="1155", MODE:="0666", GROUP:="plugdev"
43+
SUBSYSTEMS=="usb", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="1156", MODE:="0666", GROUP:="plugdev"
4344

4445
# Intel RealSense recovery devices (DFU)
4546
SUBSYSTEMS=="usb", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="0ab3", MODE:="0666", GROUP:="plugdev"
@@ -87,6 +88,8 @@ KERNEL=="iio*", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="0b6a", MODE:="0777",
8788
DRIVER=="hid_sensor*", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="0b6a", RUN+="/bin/sh -c ' chmod -R 0777 /sys/%p && chmod 0777 /dev/%k'"
8889
KERNEL=="iio*", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="0b6b", MODE:="0777", GROUP:="plugdev", RUN+="/bin/sh -c 'chmod -R 0777 /sys/%p'"
8990
DRIVER=="hid_sensor*", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="0b6b", RUN+="/bin/sh -c ' chmod -R 0777 /sys/%p && chmod 0777 /dev/%k'"
91+
KERNEL=="iio*", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="1156", MODE:="0777", GROUP:="plugdev", RUN+="/bin/sh -c 'chmod -R 0777 /sys/%p'"
92+
DRIVER=="hid_sensor*", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="1156", RUN+="/bin/sh -c ' chmod -R 0777 /sys/%p && chmod 0777 /dev/%k'"
9093

9194
# For products with motion_module, if (kernels is 4.15 and up) and (device name is "accel_3d") wait, in another process, until (enable flag is set to 1 or 200 mSec passed) and then set it to 0.
92-
KERNEL=="iio*", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="0ad5|0afe|0aff|0b00|0b01|0b3a|0b3d|0b56|0b5c|0b64|0b68|0b6a|0b6b", RUN+="/bin/sh -c '(major=`uname -r | cut -d \".\" -f1` && minor=`uname -r | cut -d \".\" -f2` && (([ $$major -eq 4 ] && [ $$minor -ge 15 ]) || [ $$major -ge 5 ])) && (enamefile=/sys/%p/name && [ `cat $$enamefile` = \"accel_3d\" ]) && enfile=/sys/%p/buffer/enable && echo \"COUNTER=0; while [ \$$COUNTER -lt 20 ] && grep -q 0 $$enfile; do sleep 0.01; COUNTER=\$$((COUNTER+1)); done && echo 0 > $$enfile\" | at now'"
95+
KERNEL=="iio*", ATTRS{idVendor}=="8086", ATTRS{idProduct}=="0ad5|0afe|0aff|0b00|0b01|0b3a|0b3d|0b56|0b5c|0b64|0b68|0b6a|0b6b|1156", RUN+="/bin/sh -c '(major=`uname -r | cut -d \".\" -f1` && minor=`uname -r | cut -d \".\" -f2` && (([ $$major -eq 4 ] && [ $$minor -ge 15 ]) || [ $$major -ge 5 ])) && (enamefile=/sys/%p/name && [ `cat $$enamefile` = \"accel_3d\" ]) && enfile=/sys/%p/buffer/enable && echo \"COUNTER=0; while [ \$$COUNTER -lt 20 ] && grep -q 0 $$enfile; do sleep 0.01; COUNTER=\$$((COUNTER+1)); done && echo 0 > $$enfile\" | at now'"

‎scripts/realsense-metadata-focal-hwe-5.13.patch

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7480bd53bd1af5a11fc890e6b9a1a2991bfa6a28 Mon Sep 17 00:00:00 2001
1+
From ddde28a28ea29750a7a9cf486d8f46283c755745 Mon Sep 17 00:00:00 2001
22
From: Dmitry Perchanov <dmitry.perchanov@intel.com>
33
Date: Sun, 22 Jan 2023 13:46:16 +0200
44
Subject: [PATCH] Enabling UVC Metadata attributes with Ubuntu 20.04. Kernel
@@ -8,15 +8,15 @@ Co-developed-by: Yu MENG <yu1.meng@intel.com>
88
Co-developed-by: Evgeni Raikhel <evgeni.raikhel@intel.com>
99
Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
1010
---
11-
drivers/media/usb/uvc/uvc_driver.c | 288 +++++++++++++++++++++++++++++
11+
drivers/media/usb/uvc/uvc_driver.c | 297 +++++++++++++++++++++++++++++
1212
drivers/media/usb/uvc/uvcvideo.h | 2 +-
13-
2 files changed, 289 insertions(+), 1 deletion(-)
13+
2 files changed, 298 insertions(+), 1 deletion(-)
1414

1515
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
16-
index 205d52412..e167ec854 100644
16+
index 205d52412..622c8bc06 100644
1717
--- a/drivers/media/usb/uvc/uvc_driver.c
1818
+++ b/drivers/media/usb/uvc/uvc_driver.c
19-
@@ -3221,6 +3221,294 @@ static const struct usb_device_id uvc_ids[] = {
19+
@@ -3221,6 +3221,303 @@ static const struct usb_device_id uvc_ids[] = {
2020
.bInterfaceSubClass = 1,
2121
.bInterfaceProtocol = 0,
2222
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -191,6 +191,15 @@ index 205d52412..e167ec854 100644
191191
+ .bInterfaceSubClass = 1,
192192
+ .bInterfaceProtocol = 0,
193193
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
194+
+ /* Intel D436 depth camera */
195+
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
196+
+ | USB_DEVICE_ID_MATCH_INT_INFO,
197+
+ .idVendor = 0x8086,
198+
+ .idProduct = 0x1156,
199+
+ .bInterfaceClass = USB_CLASS_VIDEO,
200+
+ .bInterfaceSubClass = 1,
201+
+ .bInterfaceProtocol = 0,
202+
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
194203
+ /* Intel L515 Pre-PRQ */
195204
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
196205
+ | USB_DEVICE_ID_MATCH_INT_INFO,

‎scripts/realsense-metadata-focal-hwe-5.15.patch

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1d10a22a198d8b54c252de46efd4b05396bc0aed Mon Sep 17 00:00:00 2001
1+
From 32b0a7afe8c609472f447adfb726a5e42ea99d17 Mon Sep 17 00:00:00 2001
22
From: Dmitry Perchanov <dmitry.perchanov@intel.com>
33
Date: Sun, 22 Jan 2023 13:46:16 +0200
44
Subject: [PATCH] Enabling UVC Metadata attributes with Ubuntu 20.04. Kernel
@@ -8,15 +8,15 @@ Co-developed-by: Yu MENG <yu1.meng@intel.com>
88
Co-developed-by: Evgeni Raikhel <evgeni.raikhel@intel.com>
99
Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
1010
---
11-
drivers/media/usb/uvc/uvc_driver.c | 288 +++++++++++++++++++++++++++++
11+
drivers/media/usb/uvc/uvc_driver.c | 297 +++++++++++++++++++++++++++++
1212
drivers/media/usb/uvc/uvcvideo.h | 2 +-
13-
2 files changed, 289 insertions(+), 1 deletion(-)
13+
2 files changed, 298 insertions(+), 1 deletion(-)
1414

1515
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
16-
index 2816f79ef..81b86da7c 100644
16+
index 0e3a8b38c..fcf0159d8 100644
1717
--- a/drivers/media/usb/uvc/uvc_driver.c
1818
+++ b/drivers/media/usb/uvc/uvc_driver.c
19-
@@ -3221,6 +3221,294 @@ static const struct usb_device_id uvc_ids[] = {
19+
@@ -3215,6 +3215,303 @@ static const struct usb_device_id uvc_ids[] = {
2020
.bInterfaceSubClass = 1,
2121
.bInterfaceProtocol = 0,
2222
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -191,6 +191,15 @@ index 2816f79ef..81b86da7c 100644
191191
+ .bInterfaceSubClass = 1,
192192
+ .bInterfaceProtocol = 0,
193193
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
194+
+ /* Intel D436 depth camera */
195+
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
196+
+ | USB_DEVICE_ID_MATCH_INT_INFO,
197+
+ .idVendor = 0x8086,
198+
+ .idProduct = 0x1156,
199+
+ .bInterfaceClass = USB_CLASS_VIDEO,
200+
+ .bInterfaceSubClass = 1,
201+
+ .bInterfaceProtocol = 0,
202+
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
194203
+ /* Intel L515 Pre-PRQ */
195204
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
196205
+ | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -312,7 +321,7 @@ index 2816f79ef..81b86da7c 100644
312321
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },
313322
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
314323
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
315-
index 098cc8fa4..5d252335c 100644
324+
index 242fa9352..0b7067c1d 100644
316325
--- a/drivers/media/usb/uvc/uvcvideo.h
317326
+++ b/drivers/media/usb/uvc/uvcvideo.h
318327
@@ -221,7 +221,7 @@

‎scripts/realsense-metadata-focal-master.patch

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e6e4fd91cdfdb0b9cbb439916ebd12d61f1ff1b4 Mon Sep 17 00:00:00 2001
1+
From 4219d7a6e4f4c9c2b063402b167f1288dabba0ca Mon Sep 17 00:00:00 2001
22
From: Dmitry Perchanov <dmitry.perchanov@intel.com>
33
Date: Mon, 21 Aug 2023 15:10:57 +0300
44
Subject: [PATCH] Enabling UVC Metadata attributes with Ubuntu 20.04. Kernel
@@ -7,15 +7,15 @@ Subject: [PATCH] Enabling UVC Metadata attributes with Ubuntu 20.04. Kernel
77
Co-developed-by: Evgeni Raikhel <evgeni.raikhel@intel.com>
88
Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
99
---
10-
drivers/media/usb/uvc/uvc_driver.c | 279 +++++++++++++++++++++++++++++
10+
drivers/media/usb/uvc/uvc_driver.c | 288 +++++++++++++++++++++++++++++
1111
drivers/media/usb/uvc/uvcvideo.h | 2 +-
12-
2 files changed, 280 insertions(+), 1 deletion(-)
12+
2 files changed, 289 insertions(+), 1 deletion(-)
1313

1414
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
15-
index 3be9bc97f..386832678 100644
15+
index b77eef67d..c0b9bd21a 100644
1616
--- a/drivers/media/usb/uvc/uvc_driver.c
1717
+++ b/drivers/media/usb/uvc/uvc_driver.c
18-
@@ -2916,6 +2916,285 @@ static const struct usb_device_id uvc_ids[] = {
18+
@@ -3029,6 +3029,294 @@ static const struct usb_device_id uvc_ids[] = {
1919
.bInterfaceSubClass = 1,
2020
.bInterfaceProtocol = 0,
2121
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -190,6 +190,15 @@ index 3be9bc97f..386832678 100644
190190
+ .bInterfaceSubClass = 1,
191191
+ .bInterfaceProtocol = 0,
192192
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
193+
+ /* Intel D436 depth camera */
194+
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
195+
+ | USB_DEVICE_ID_MATCH_INT_INFO,
196+
+ .idVendor = 0x8086,
197+
+ .idProduct = 0x1156,
198+
+ .bInterfaceClass = USB_CLASS_VIDEO,
199+
+ .bInterfaceSubClass = 1,
200+
+ .bInterfaceProtocol = 0,
201+
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
193202
+ /* Intel L515 Pre-PRQ */
194203
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
195204
+ | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -302,10 +311,10 @@ index 3be9bc97f..386832678 100644
302311
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },
303312
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
304313
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
305-
index a3dfacf06..898eebe42 100644
314+
index ced37a11a..01a3923b3 100644
306315
--- a/drivers/media/usb/uvc/uvcvideo.h
307316
+++ b/drivers/media/usb/uvc/uvcvideo.h
308-
@@ -181,7 +181,7 @@
317+
@@ -215,7 +215,7 @@
309318
/* Maximum number of packets per URB. */
310319
#define UVC_MAX_PACKETS 32
311320
/* Maximum status buffer size in bytes of interrupt URB. */
@@ -315,5 +324,5 @@ index a3dfacf06..898eebe42 100644
315324
#define UVC_CTRL_CONTROL_TIMEOUT 500
316325
#define UVC_CTRL_STREAMING_TIMEOUT 5000
317326
--
318-
2.34.1
327+
2.25.1
319328

‎scripts/realsense-metadata-jammy-hwe-6.2.patch

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
From 3df5a4700229bd76b6c460e0b26529637f3ed172 Mon Sep 17 00:00:00 2001
1+
From c66fc5a4acc09b51d5ad0cf9b1c9cfc07b595b16 Mon Sep 17 00:00:00 2001
22
From: Dmitry Perchanov <dmitry.perchanov@intel.com>
33
Date: Sun, 13 Aug 2023 12:13:21 +0300
44
Subject: [PATCH] Enabling UVC Metadata attributes, Ubuntu jammy 22.04. Kernel
55
6.2
66

77
Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
88
---
9-
drivers/media/usb/uvc/uvc_driver.c | 99 ++++++++++++++++++++++++++++++
10-
drivers/media/usb/uvc/uvcvideo.h | 2 +-
11-
2 files changed, 100 insertions(+), 1 deletion(-)
9+
drivers/media/usb/uvc/uvc_driver.c | 108 +++++++++++++++++++++++++++++
10+
drivers/media/usb/uvc/uvcvideo.h | 2 +-
11+
2 files changed, 109 insertions(+), 1 deletion(-)
1212

1313
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
14-
index 362df9dd3..3fedf65ab 100644
14+
index 5ab3fc04c..6b1c6153b 100644
1515
--- a/drivers/media/usb/uvc/uvc_driver.c
1616
+++ b/drivers/media/usb/uvc/uvc_driver.c
17-
@@ -2963,6 +2963,33 @@ static const struct usb_device_id uvc_ids[] = {
17+
@@ -2969,6 +2969,33 @@ static const struct usb_device_id uvc_ids[] = {
1818
.bInterfaceSubClass = 1,
1919
.bInterfaceProtocol = 0,
2020
.driver_info = (kernel_ulong_t)&uvc_ctrl_power_line_limited },
@@ -48,7 +48,7 @@ index 362df9dd3..3fedf65ab 100644
4848
/* Intel RealSense D4M */
4949
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
5050
| USB_DEVICE_ID_MATCH_INT_INFO,
51-
@@ -2972,6 +2999,78 @@ static const struct usb_device_id uvc_ids[] = {
51+
@@ -2978,6 +3005,87 @@ static const struct usb_device_id uvc_ids[] = {
5252
.bInterfaceSubClass = 1,
5353
.bInterfaceProtocol = 0,
5454
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -70,6 +70,15 @@ index 362df9dd3..3fedf65ab 100644
7070
+ .bInterfaceSubClass = 1,
7171
+ .bInterfaceProtocol = 0,
7272
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
73+
+ /* Intel D436 depth camera */
74+
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
75+
+ | USB_DEVICE_ID_MATCH_INT_INFO,
76+
+ .idVendor = 0x8086,
77+
+ .idProduct = 0x1156,
78+
+ .bInterfaceClass = USB_CLASS_VIDEO,
79+
+ .bInterfaceSubClass = 1,
80+
+ .bInterfaceProtocol = 0,
81+
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
7382
+ /* Intel D555 Depth Camera */
7483
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
7584
+ | USB_DEVICE_ID_MATCH_INT_INFO,

‎scripts/realsense-metadata-jammy-hwe-6.5.patch

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,34 @@
1-
From cd69befded13738c855bb40b99dbee24676f0a41 Mon Sep 17 00:00:00 2001
1+
From 4b8a3b2cbe9d0f658e72e62b13f5b6ee756372dd Mon Sep 17 00:00:00 2001
22
From: Dmitry <dmitry.perchanov@intel.com>
33
Date: Sun, 7 Jul 2024 04:56:36 -0400
44
Subject: [PATCH] RealSense UVC Metadata, jammy kernel 6.5
55

66
Signed-off-by: Dmitry <dmitry.perchanov@intel.com>
77
---
8-
drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++
9-
1 file changed, 9 insertions(+)
8+
drivers/media/usb/uvc/uvc_driver.c | 18 ++++++++++++++++++
9+
1 file changed, 18 insertions(+)
1010

1111
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
12-
index fb3e43dde..b04271d30 100644
12+
index 7b6479dac..bc92234db 100644
1313
--- a/drivers/media/usb/uvc/uvc_driver.c
1414
+++ b/drivers/media/usb/uvc/uvc_driver.c
15-
@@ -3147,6 +3147,15 @@ static const struct usb_device_id uvc_ids[] = {
15+
@@ -3084,6 +3084,15 @@ static const struct usb_device_id uvc_ids[] = {
16+
.bInterfaceSubClass = 1,
17+
.bInterfaceProtocol = 0,
18+
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
19+
+ /* Intel D436 depth camera */
20+
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
21+
+ | USB_DEVICE_ID_MATCH_INT_INFO,
22+
+ .idVendor = 0x8086,
23+
+ .idProduct = 0x1156,
24+
+ .bInterfaceClass = USB_CLASS_VIDEO,
25+
+ .bInterfaceSubClass = 1,
26+
+ .bInterfaceProtocol = 0,
27+
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
28+
/* Intel D555 Depth Camera */
29+
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
30+
| USB_DEVICE_ID_MATCH_INT_INFO,
31+
@@ -3129,6 +3138,15 @@ static const struct usb_device_id uvc_ids[] = {
1632
.bInterfaceSubClass = 1,
1733
.bInterfaceProtocol = UVC_PC_PROTOCOL_15,
1834
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },

‎scripts/realsense-metadata-jammy-hwe-6.8.patch

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
1-
From 25a687e89e8f365caccef1b9bbb11406e53cc1be Mon Sep 17 00:00:00 2001
1+
From bf995360a83d28d88308c811a4e91c21b3cdd1e1 Mon Sep 17 00:00:00 2001
22
From: Arun-Prasad-V <arun.prasad.v@intel.com>
33
Date: Mon, 5 Aug 2024 15:02:57 +0530
44
Subject: [PATCH] Realsense camera metadata support for kernel 6.8
55

66
---
7-
drivers/media/usb/uvc/uvc_driver.c | 36 ++++++++++++++++++++++++++++++
8-
1 file changed, 36 insertions(+)
7+
drivers/media/usb/uvc/uvc_driver.c | 45 ++++++++++++++++++++++++++++++
8+
1 file changed, 45 insertions(+)
99

1010
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
11-
index bbd90123a..1cd98a8cc 100644
11+
index 91a41aa3c..bc04a3182 100644
1212
--- a/drivers/media/usb/uvc/uvc_driver.c
1313
+++ b/drivers/media/usb/uvc/uvc_driver.c
14-
@@ -3102,6 +3102,15 @@ static const struct usb_device_id uvc_ids[] = {
14+
@@ -3133,6 +3133,24 @@ static const struct usb_device_id uvc_ids[] = {
1515
.bInterfaceSubClass = 1,
1616
.bInterfaceProtocol = 0,
1717
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
18+
+ /* Intel D436 depth camera */
19+
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
20+
+ | USB_DEVICE_ID_MATCH_INT_INFO,
21+
+ .idVendor = 0x8086,
22+
+ .idProduct = 0x1156,
23+
+ .bInterfaceClass = USB_CLASS_VIDEO,
24+
+ .bInterfaceSubClass = 1,
25+
+ .bInterfaceProtocol = 0,
26+
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
1827
+ /* Intel D555 Depth Camera */
1928
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
2029
+ | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -27,7 +36,7 @@ index bbd90123a..1cd98a8cc 100644
2736
/* Intel D405 Depth Camera */
2837
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE
2938
| USB_DEVICE_ID_MATCH_INT_INFO,
30-
@@ -3120,6 +3129,33 @@ static const struct usb_device_id uvc_ids[] = {
39+
@@ -3151,6 +3169,33 @@ static const struct usb_device_id uvc_ids[] = {
3140
.bInterfaceSubClass = 1,
3241
.bInterfaceProtocol = 0,
3342
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -62,5 +71,5 @@ index bbd90123a..1cd98a8cc 100644
6271
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },
6372
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
6473
--
65-
2.43.0
74+
2.34.1
6675

‎scripts/realsense-metadata-jammy-master.patch

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f8c4dca6a001d42a79a2a7a5d9fc4748bb5df25c Mon Sep 17 00:00:00 2001
1+
From a2acb950b65b4a8e87451c28dd5a1a6bdaaa7ab6 Mon Sep 17 00:00:00 2001
22
From: Dmitry Perchanov <dmitry.perchanov@intel.com>
33
Date: Sun, 22 Jan 2023 12:58:19 +0200
44
Subject: [PATCH] Enabling UVC Metadata attributes with Ubuntu 22.04. Kernel
@@ -8,15 +8,15 @@ Co-developed-by: Yu MENG <yu1.meng@intel.com>
88
Co-developed-by: Evgeni Raikhel <evgeni.raikhel@intel.com>
99
Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
1010
---
11-
drivers/media/usb/uvc/uvc_driver.c | 288 +++++++++++++++++++++++++++++
11+
drivers/media/usb/uvc/uvc_driver.c | 297 +++++++++++++++++++++++++++++
1212
drivers/media/usb/uvc/uvcvideo.h | 2 +-
13-
2 files changed, 289 insertions(+), 1 deletion(-)
13+
2 files changed, 298 insertions(+), 1 deletion(-)
1414

1515
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
16-
index caed9a2ab..c6763420b 100644
16+
index caed9a2ab..e72113059 100644
1717
--- a/drivers/media/usb/uvc/uvc_driver.c
1818
+++ b/drivers/media/usb/uvc/uvc_driver.c
19-
@@ -3234,6 +3234,294 @@ static const struct usb_device_id uvc_ids[] = {
19+
@@ -3234,6 +3234,303 @@ static const struct usb_device_id uvc_ids[] = {
2020
.bInterfaceSubClass = 1,
2121
.bInterfaceProtocol = 0,
2222
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
@@ -191,6 +191,15 @@ index caed9a2ab..c6763420b 100644
191191
+ .bInterfaceSubClass = 1,
192192
+ .bInterfaceProtocol = 0,
193193
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
194+
+ /* Intel D436 depth camera */
195+
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
196+
+ | USB_DEVICE_ID_MATCH_INT_INFO,
197+
+ .idVendor = 0x8086,
198+
+ .idProduct = 0x1156,
199+
+ .bInterfaceClass = USB_CLASS_VIDEO,
200+
+ .bInterfaceSubClass = 1,
201+
+ .bInterfaceProtocol = 0,
202+
+ .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
194203
+ /* Intel L515 Pre-PRQ */
195204
+ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
196205
+ | USB_DEVICE_ID_MATCH_INT_INFO,
@@ -312,7 +321,7 @@ index caed9a2ab..c6763420b 100644
312321
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },
313322
{ USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
314323
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
315-
index 20782860d..f469327d9 100644
324+
index 186191290..112b7ea22 100644
316325
--- a/drivers/media/usb/uvc/uvcvideo.h
317326
+++ b/drivers/media/usb/uvc/uvcvideo.h
318327
@@ -224,7 +224,7 @@

0 commit comments

Comments
 (0)