xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: vivid: set num_in/outputs to 0 if not supported

Browse Source 
[ Upstream commit 69d78a80da4ef12faf2a6f9cfa2097ab4ac43983 ]

If node_types does not have video/vbi/meta inputs or outputs,
then set num_inputs/num_outputs to 0 instead of 1.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Fixes: 0c90f649d2 (media: vivid: add vivid_create_queue() helper)
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hans Verkuil
2022-10-17 15:09:06 +01:00
committed by Greg Kroah-Hartman
parent b6c7446d0a
commit 905f05c0ab
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/test-drivers/vivid/vivid-core.c
View File

@@ -872,8 +872,12 @@ static int vivid_detect_feature_set(struct vivid_dev *dev, int inst,
/* how many inputs do we have and of what type? */ /* how many inputs do we have and of what type? */
dev->num_inputs = num_inputs[inst]; dev->num_inputs = num_inputs[inst];
if (dev->num_inputs < 1) if (node_type & 0x20007) {
dev->num_inputs = 1; if (dev->num_inputs < 1)
dev->num_inputs = 1;
} else {
dev->num_inputs = 0;
}
if (dev->num_inputs >= MAX_INPUTS) if (dev->num_inputs >= MAX_INPUTS)
dev->num_inputs = MAX_INPUTS; dev->num_inputs = MAX_INPUTS;
for (i = 0; i < dev->num_inputs; i++) { for (i = 0; i < dev->num_inputs; i++) {
@@ -890,8 +894,12 @@ static int vivid_detect_feature_set(struct vivid_dev *dev, int inst,
/* how many outputs do we have and of what type? */ /* how many outputs do we have and of what type? */
dev->num_outputs = num_outputs[inst]; dev->num_outputs = num_outputs[inst];
if (dev->num_outputs < 1) if (node_type & 0x40300) {
dev->num_outputs = 1; if (dev->num_outputs < 1)
dev->num_outputs = 1;
} else {
dev->num_outputs = 0;
}
if (dev->num_outputs >= MAX_OUTPUTS) if (dev->num_outputs >= MAX_OUTPUTS)
dev->num_outputs = MAX_OUTPUTS; dev->num_outputs = MAX_OUTPUTS;
for (i = 0; i < dev->num_outputs; i++) { for (i = 0; i < dev->num_outputs; i++) {