Skip to content

media: iris: Fix DMA coherency and frame interval enumeration issues #900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gouravk-qualcomm wants to merge 3 commits into
base: qcom-6.18.y
Choose a base branch
from
Open

media: iris: Fix DMA coherency and frame interval enumeration issues #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
663b953
FROMLIST: dt-bindings: media: qcom,sc7280-venus: Add dma-coherent pro…
Aug 1, 2026
8cb1fc2
FROMLIST: arm64: dts: qcom: sc7280: Add dma-coherent property into ve…
Aug 1, 2026
0c7f7ab
FROMLIST: media: iris: Fix frame interval enumeration for non-divisor…
Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ properties:
- const: iface
- const: vcodec_core
- const: vcodec_bus
dma-coherent: true

iommus:
minItems: 1
Expand Down Expand Up @@ -86,6 +87,7 @@ properties:

required:
- compatible
- dma-coherent
- power-domain-names
- iommus

Expand Down Expand Up @@ -119,6 +121,7 @@ examples:
interconnects = <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_VENUS_CFG 0>,
<&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>;
interconnect-names = "cpu-cfg", "video-mem";
dma-coherent;

iommus = <&apps_smmu 0x2180 0x20>,
<&apps_smmu 0x2184 0x20>;
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/sc7280.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4986,6 +4986,7 @@
interconnects = <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_VENUS_CFG 0>,
<&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>;
interconnect-names = "cpu-cfg", "video-mem";
dma-coherent;

iommus = <&apps_smmu 0x2180 0x20>;
memory-region = <&video_mem>;
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/qcom/iris/iris_vidc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,14 +440,14 @@ static int iris_enum_frameintervals(struct file *filp, void *fh,
mbpf = NUM_MBS_PER_FRAME(fival->height, fival->width);
fps = DIV_ROUND_UP(core->iris_platform_data->max_core_mbps, mbpf);

fival->type = V4L2_FRMIVAL_TYPE_STEPWISE;
fival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS;
fival->stepwise.min.numerator = 1;
fival->stepwise.min.denominator =
min_t(u32, fps, MAXIMUM_FPS);
fival->stepwise.max.numerator = 1;
fival->stepwise.max.denominator = 1;
fival->stepwise.step.numerator = 1;
fival->stepwise.step.denominator = MAXIMUM_FPS;
fival->stepwise.step.denominator = 1;

return 0;
}
Expand Down