Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ properties:
- const: vcodec_core
- const: vcodec_bus

dma-coherent: true

iommus:
maxItems: 1

Expand Down Expand Up @@ -100,6 +102,7 @@ properties:

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

Expand Down Expand Up @@ -134,6 +137,8 @@ examples:
<&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
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