mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-06 08:17:06 +08:00
d81c03f05e
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 67b85dd90938f63b00e8c53ddc60357eafece93b Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 16 Jan 2025 18:24:17 +0000
|
|
Subject: [PATCH] media: hevc_dec: Add module parameter for video_nr
|
|
|
|
To avoid user complaints that /dev/video0 isn't their USB
|
|
webcam, add downstream patch that allows setting the preferred
|
|
video device number.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/media/platform/raspberrypi/hevc_dec/hevc_d.c | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/media/platform/raspberrypi/hevc_dec/hevc_d.c
|
|
+++ b/drivers/media/platform/raspberrypi/hevc_dec/hevc_d.c
|
|
@@ -25,6 +25,15 @@
|
|
#include "hevc_d_video.h"
|
|
#include "hevc_d_hw.h"
|
|
|
|
+/*
|
|
+ * Default /dev/videoN node number.
|
|
+ * Deliberately avoid the very low numbers as these are often taken by webcams
|
|
+ * etc, and simple apps tend to only go for /dev/video0.
|
|
+ */
|
|
+static int video_nr = 19;
|
|
+module_param(video_nr, int, 0644);
|
|
+MODULE_PARM_DESC(video_nr, "decoder video device number");
|
|
+
|
|
static const struct hevc_d_control hevc_d_ctrls[] = {
|
|
{
|
|
.cfg = {
|
|
@@ -373,7 +382,7 @@ static int hevc_d_probe(struct platform_
|
|
dev->mdev.ops = &hevc_d_m2m_media_ops;
|
|
dev->v4l2_dev.mdev = &dev->mdev;
|
|
|
|
- ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
|
|
+ ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr);
|
|
if (ret) {
|
|
v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
|
|
goto err_m2m;
|