Hi Mauro, As discussed here are all my atomisp changes for 6.1 + 3 atomisp patches from others as a pull-req. All these patches have been posted on the list and I have addressed all review remarks to these patches. Highlights: -Fix VIDIOC_TRY_FMT so that it actually works -hmm[_bo] cleanups (videobuf2 conversion prep) -locking cleanups (videobuf2 conversion prep) -remove software watchdog implementation -lots of other cleanups -in total this removes over 2000 lines of code Regards, Hans p.s. This pull-req is for a signed tag, if you don't have my public key yet you can find it here: https://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git/tree/keys/7C31E21A98D21E0D.asc The following changes since commit 568035b01cfb107af8d2e4bd2fb9aea22cf5b868: Linux 6.0-rc1 (2022-08-14 15:50:18 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux.git tags/media-atomisp-6.1-1 for you to fetch changes up to 537715a44f042f8d93a1554c87b9a05d377cd7f2: media: atomisp_gmin_platform: Unexport and split camera_sensor_csi() (2022-09-21 11:14:05 +0200) ---------------------------------------------------------------- media: atomisp: Changes for 6.1-1 Highlights: -hmm[_bo] cleanups (videobuf2 conversion prep) -locking cleanups (videobuf2 conversion prep) -remove software watchdog implementation -lots of other cleanups -in total this removes over 2000 lines of code ---------------------------------------------------------------- Andy Shevchenko (2): media: atomisp_gmin_platform: Switch to use acpi_evaluate_dsm_typed() media: atomisp_gmin_platform: Unexport and split camera_sensor_csi() Dan Carpenter (1): media: atomisp: prevent integer overflow in sh_css_set_black_frame() Hans de Goede (41): media: atomisp-ov2680: Fix ov2680_set_fmt() media: atomisp-ov2680: Don't take the input_lock for try_fmt calls. media: atomisp-ov2680: Improve ov2680_set_fmt() error handling media: atomisp-notes: Add info about sensors v4l2_get_subdev_hostdata() use media: atomisp: Fix VIDIOC_TRY_FMT media: atomisp: Make atomisp_try_fmt_cap() take padding into account media: atomisp: hmm_bo: Simplify alloc_private_pages() media: atomisp: hmm_bo: Further simplify alloc_private_pages() media: atomisp: hmm_bo: Rewrite alloc_private_pages() using pages_array helper funcs media: atomisp: hmm_bo: Rewrite free_private_pages() using pages_array helper funcs media: atomisp: hmm_bo: Drop PFN code path from alloc_user_pages() media: atomisp: Ensure that USERPTR pointers are page aligned media: atomisp: Fix device_caps reporting of the registered video-devs media: atomisp: Remove file-injection support media: atomisp: Remove atomisp_file_fops and atomisp_file_ioctl_ops media: atomisp: Remove the outq videobuf queue media: atomisp: Remove never set file_input flag media: atomisp: Remove the ACC device node media: atomisp: Remove some further ATOMISP_ACC_* related dead code media: atomisp: Remove empty atomisp_css_set_cont_prev_start_time() function media: atomisp: Split subdev and video-node registration into 2 steps media: atomisp: Register /dev/* nodes at the end of atomisp_pci_probe() media: atomisp: Remove loading mutex media: atomisp: Fix v4l2_fh resource leak on open errors media: atomisp: Simplify v4l2_fh_open() error handling media: atomisp: Use a normal mutex for the main lock media: atomisp: Remove unused lock member from struct atomisp_sub_device media: atomisp: Fix locking around asd->streaming read/write media: atomisp: Remove asd == NULL checks from ioctl handling media: atomisp: Add atomisp_pipe_check() helper media: atomisp: Remove watchdog timer media: atomisp: Move atomisp_streaming_count() check into __atomisp_css_recover() media: atomisp: Rework asd->streaming state update in __atomisp_streamoff() media: atomisp: Drop streamoff_mutex media: atomisp: Use video_dev.lock for ioctl locking media: atomisp: Remove a couple of not useful function wrappers media: atomisp: Drop unnecessary first_streamoff check media: atomisp: Make atomisp_set_raw_buffer_bitmap() static media: atomisp: Remove unused atomisp_css_get_dis_statistics() media: atomisp: Remove const/fixed camera_caps media: atomisp: Remove atomisp_source_pad_to_stream_id() drivers/staging/media/atomisp/Makefile | 1 - drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 19 +- drivers/staging/media/atomisp/include/hmm/hmm_bo.h | 6 - .../staging/media/atomisp/include/linux/atomisp.h | 14 - .../atomisp/include/linux/atomisp_gmin_platform.h | 2 - .../media/atomisp/include/linux/atomisp_platform.h | 18 - drivers/staging/media/atomisp/notes.txt | 19 + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 715 ++----------------- drivers/staging/media/atomisp/pci/atomisp_cmd.h | 11 +- drivers/staging/media/atomisp/pci/atomisp_compat.h | 10 - .../media/atomisp/pci/atomisp_compat_css20.c | 100 +-- drivers/staging/media/atomisp/pci/atomisp_file.c | 229 ------ drivers/staging/media/atomisp/pci/atomisp_file.h | 44 -- drivers/staging/media/atomisp/pci/atomisp_fops.c | 274 ++------ .../media/atomisp/pci/atomisp_gmin_platform.c | 94 ++- .../staging/media/atomisp/pci/atomisp_internal.h | 55 +- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 768 ++++----------------- drivers/staging/media/atomisp/pci/atomisp_ioctl.h | 14 +- drivers/staging/media/atomisp/pci/atomisp_subdev.c | 133 +--- drivers/staging/media/atomisp/pci/atomisp_subdev.h | 71 +- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 164 +---- drivers/staging/media/atomisp/pci/atomisp_v4l2.h | 3 - drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 198 +----- drivers/staging/media/atomisp/pci/sh_css_params.c | 4 +- 24 files changed, 445 insertions(+), 2521 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.c delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_file.h
