This PR merges all except for the final patch of the ti-vpe cal MC series: https://patchwork.linuxtv.org/project/linux-media/cover/20201206235353.26968-1-laurent.pinchart@xxxxxxxxxxxxxxxx/ It is very likely that by the time this PR can be merged there will be a v2 of this PR containing the last patch as well, but for now I want to post this to ensure that at least these patches will be merged. Regards, Hans The following changes since commit 63288c829b1a5991d8f8c15cab596108ed206ba6: media: pixfmt-compressed.rst: fix 'bullet' formatting (2020-12-03 12:27:34 +0100) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.12a for you to fetch changes up to e385a8f247331d5a1fd1cbe51ef8032106445f66: media: ti-vpe: cal: Simplify the context API (2020-12-07 10:50:08 +0100) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Laurent Pinchart (23): media: ti-vpe: cal: Create subdev for CAMERARX media: ti-vpe: cal: Drop cal_ctx m_fmt field media: ti-vpe: cal: Move format handling to cal.c and expose helpers media: ti-vpe: cal: Rename MAX_(WIDTH|HEIGHT)_* macros with CAL_ prefix media: ti-vpe: cal: Replace hardcoded BIT() value with macro media: ti-vpe: cal: Iterate over correct number of CAMERARX instances media: ti-vpe: cal: Implement subdev ops for CAMERARX media: ti-vpe: cal: Use CAMERARX subdev s_stream op in video device code media: ti-vpe: cal: Don't pass format to cal_ctx_wr_dma_config() media: ti-vpe: cal: Rename struct cal_fmt to cal_format_info media: ti-vpe: cal: Refactor interrupt enable/disable media: ti-vpe: cal: Fold PPI enable in CAMERARX .s_stream() media: ti-vpe: cal: Stop write DMA without disabling PPI media: ti-vpe: cal: Use spin_lock_irq() when starting or stopping stream media: ti-vpe: cal: Share buffer release code between start and stop media: ti-vpe: cal: Drop V4L2_CAP_READWRITE media: ti-vpe: cal: Drop unneeded check in cal_calc_format_size() media: ti-vpe: cal: Remove DMA queue empty check at start streaming time media: ti-vpe: cal: Use list_first_entry() media: ti-vpe: cal: Group all DMA queue fields in struct cal_dmaqueue media: ti-vpe: cal: Set cal_dmaqueue.pending to NULL when no pending buffer media: ti-vpe: cal: Store buffer DMA address in dma_addr_t media: ti-vpe: cal: Simplify the context API drivers/media/platform/ti-vpe/cal-camerarx.c | 373 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- drivers/media/platform/ti-vpe/cal-video.c | 394 ++++++++++++++++++++++++----------------------------------------------- drivers/media/platform/ti-vpe/cal.c | 385 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- drivers/media/platform/ti-vpe/cal.h | 103 +++++++++++++------ 4 files changed, 809 insertions(+), 446 deletions(-)
