github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-25 09:41:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: iris: Enumerate cap->bus_info to differentiate between encoder and decoder

Browse Source 
commit 66c744e28b ("media: venus: assign unique bus_info strings for
encoder and decoder") introduced the naming convention
plat:node-addr:video-codec{enc|dec}. Right now Iris does not replicate this
naming convention.

When we do v4l2-ctrl --list -devices we see:
Iris Decoder (platform:aa00000.video-codec):
	/dev/video0
	/dev/video1

Enumerate the bus_info field of the capabilities structure for namespace
parity and appropriate differentiation:
Iris Decoder (plat:aa00000.video-codec:dec):
	/dev/video0

Iris Encoder (plat:aa00000.video-codec:enc):
	/dev/video1

Fixes: 5ad964ad56 ("media: iris: Initialize and deinitialize encoder instance structure")
Cc: stable@vger.kernel.org
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
This commit is contained in:
Bryan O'Donoghue 2026-06-02 14:59:21 +01:00 committed by Bryan O'Donoghue
parent d2f0ebbcde
commit 94ef75095d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/platform/qcom/iris/iris_vidc.c
View File

@ -449,14 +449,21 @@ static int iris_enum_frameintervals(struct file *filp, void *fh,
static int iris_querycap(struct file *filp, void *fh, struct v4l2_capability *cap)
{
struct iris_core *core = video_drvdata(filp);
struct iris_inst *inst = iris_get_inst(filp);
char *info;
strscpy(cap->driver, IRIS_DRV_NAME, sizeof(cap->driver));
if (inst->domain == DECODER)
if (inst->domain == DECODER) {
strscpy(cap->card, "Iris Decoder", sizeof(cap->card));
else
info = "dec";
} else {
strscpy(cap->card, "Iris Encoder", sizeof(cap->card));
info = "enc";
}
snprintf(cap->bus_info, sizeof(cap->bus_info),
"plat:%s:%s", dev_name(core->dev), info);
return 0;
}