V5: - drops ret = fn(); return ret; for return fn(); - Hans, Konrad Link: https://lore.kernel.org/linux-arm-msm/20230907164410.36651-16-bryan.odonoghue@xxxxxxxxxx/ Bootable: Link: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/linux-next-23-09-06-lenovo-x13s-v6.5-rc7-x13s-camss-patches-v5 V4: - Adds additional Reviewed-by / Acked-by from Laurent and Konrad as indicated - Updates commit log per Laurent suggestion not go on hunger strike Link: https://lore.kernel.org/linux-arm-msm/20230828185110.GN14596@xxxxxxxxxxxxxxxxxxxxxxxxxx/ - Includes suggested changes to switch {} statements - Laurent Link: https://lore.kernel.org/linux-media/d7745ece-bea1-f8f9-a1d2-0f01aa221ade@xxxxxxxxxx/ - Drops SoC specific vfe_get()/vfe_put() we have been using. There is no need to differentiate on SoC since get/put reference count. Link: https://lore.kernel.org/linux-media/62f78aac-c1e4-018c-93c2-4dac1ec7c688@xxxxxxxxxx/ - Changes the name of the generic struct resources to struct camss_subdev_resources - Laurent Link: https://lore.kernel.org/lkml/20230828173055.GF14596@xxxxxxxxxxxxxxxxxxxxxxxxxx/ - media: qcom: camss: media: qcom: camss: Move vfe_disable into a common routine where applicable Follows up on a comment from Laurent Link: https://lore.kernel.org/linux-media/20230828171725.GZ14596@xxxxxxxxxxxxxxxxxxxxxxxxxx/ - media: qcom: camss: Propagate vfe_reset error up the callstack Take the different approach to fixing the vfe_disable() routine doing nothing but returning 0 Per Konrad's correct comment on vfe_reset() error Link: https://lore.kernel.org/linux-media/aaf9db49-54c4-4c27-8206-61e86ad560c2@xxxxxxxxxx/ - Restricts the length of buffer size for clock name string lookups - Konrad Link: https://lore.kernel.org/linux-arm-msm/076d958f-2cf3-4a52-99a2-52a6cdd5443c@xxxxxxxxxx/ - Some outstanding issues not addressed in this series * Clock name string lookups. This warrants a standalone series - which will need yaml and dts changes to group clocks by name across all supported SoCs. This will then negate the string matching for clocks. Link: https://lore.kernel.org/linux-arm-msm/3b3682be-5dbd-5e2d-a6c1-7bdf6d3ff8cd@xxxxxxxxxx/ * Pixel formats are assigned via control strucutres not pointers from compat params The struct resources stuff is still sub-optimal and it feels to me as if we should do a bigger intervention to break away from a generic structure to subdevice specific parameter structures. Such a subdevice specific structure would support passing pxiel formats. * We still need to follow up on having named genpds instead of magic indexes Link: https://lore.kernel.org/lkml/b7e1d035-ee79-77c9-e81f-56fa8c2cf1df@xxxxxxxxxx/ * More generally this driver allows for arbitrary connection of CSID, RDI and VFE but, that is not how the hardware works. I believe other people have works in progress to address some of this shortcoming separately. Bootable - includes tag for patches queued in Hans staging tree Link: https://git.codelinaro.org/bryan.odonoghue/kernel/-/commits/22ed4a935d6d323e71b014a69bafd638ad53cb5c V3: - Adds RB/AB as indicated - Konrad - Replaces >= SDM845 with helper function per discussion - bod/Konrad - Leaves out constraining VFE clock names sizes. A full pass for resource strings will happen later. - bod - Clarifies commit log resulting in updated patch title also "Add support for setting CSIPHY clock name csiphyX" -> "Fix support for setting CSIPHY clock name csiphyX" - Adds patch to remove dead integer return type in vfe_disable() - Adds patch to comment CSID dt_id meanining which I personally find non-obvious right now - bod Link: https://git.codelinaro.org/bryan.odonoghue/kernel/-/commits/09e7805a733b488c5dc19b301eb3b77cb0fad3d6 V2: - Replaces &camss->res with pointer to res - Konrad - Squashes patch for NULL removal - Konrad - Left suggestion on ICC initialisation points alone, doesn't seem to fit Konrad/bod Link: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/linux-next-23-08-07-db410c-rb3-camss-dts-v3+maintenance-bugfixes-v2 V1: - I forgot to include patch # 14 in V0 of this series. This patch leverages previous changes to unwind the fixed polling of RDI[0..2] allowing driver data to articulate on a per-VFE basis how many RDIs to poll. Link: https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/linux-next-23-08-07-db410c-rb3-camss-dts-v3+maintenance-bugfixes-v1 V0: This second series of bugfixes stacks ontop of the Fixes series sent earlier. Link: https://lore.kernel.org/linux-arm-msm/20230814141007.3721197-1-bryan.odonoghue@xxxxxxxxxx/T/#t Rather than send both series as one giant series, I opted to send a pure Fixes series above, with this second series a non-backport series i.e. no Fixes tags in this series. The existing CAMSS code relies on some hard-coded parameters buried inside of the driver, instead of passed via compat .data as arguably ought to be the case. This brittle model is an extending morass of spaghetti code. More than that in CAMSS Video Front Ends (VFEs) and the number of Raw Data Interfaces (RDIs) per VFE can vary from SoC to SoC. Indeed sm8250 has VFE and VFE Lite blocks which have a different number of RDIs per block. The use of defines as opposed to per-compat parameters inside of ISRs leads to either under-polling or over-polling the number of RDIs. On top of all of that we have some hard-coded statements for clock names which breaks easily. We can solve the under/over polling loop problem by transitioning loop controls from macros to parameters passed via probe(). Similarly and unsurprisingly we can also solve the hard-coded clock problem by adding some string processing routines that take passed arguments. There is still some additional maintenance work to be done in this driver but before adding one more SoC the code needs to be made more extensible and less brittle. Link: https://git.codelinaro.org/bryan.odonoghue/kernel/-/commits/dc346c7f46c0680bcfb84fded6db97497fffe49a Bryan O'Donoghue (17): media: qcom: camss: Amalgamate struct resource with struct resource_ispif media: qcom: camss: Rename camss struct resources to camss_subdev_resources media: qcom: camss: Start to move to module compat matched resources media: qcom: camss: Pass icc bandwidth table as a platform parameter media: qcom: camss: Pass remainder of variables as resources media: qcom: camss: Pass line_num from compat resources media: qcom: camss: Pass CAMSS subdev callbacks via resource ops pointer media: qcom: camss: Assign the correct number of RDIs per VFE media: qcom: camss: Remove special case for VFE get/put media: qcom: camss: Untangle if/else spaghetti in camss media: qcom: camss: Allow clocks vfeN vfe_liteN or vfe_lite media: qcom: camss: Functionally decompose CSIPHY clock lookups media: qcom: camss: Fix support for setting CSIPHY clock name csiphyX media: qcom: camss: Support RDI3 for VFE 17x media: qcom: camss: Move vfe_disable into a common routine where applicable media: qcom: camss: Propagate vfe_reset error up the callstack media: qcom: camss: Comment CSID dt_id field .../platform/qcom/camss/camss-csid-gen2.c | 5 + .../media/platform/qcom/camss/camss-csid.c | 28 +- .../media/platform/qcom/camss/camss-csid.h | 4 +- .../qcom/camss/camss-csiphy-3ph-1-0.c | 8 +- .../media/platform/qcom/camss/camss-csiphy.c | 67 +-- .../media/platform/qcom/camss/camss-csiphy.h | 4 +- .../media/platform/qcom/camss/camss-ispif.c | 32 +- .../media/platform/qcom/camss/camss-ispif.h | 4 +- .../media/platform/qcom/camss/camss-vfe-170.c | 57 +-- .../media/platform/qcom/camss/camss-vfe-4-1.c | 2 - .../media/platform/qcom/camss/camss-vfe-4-7.c | 2 - .../media/platform/qcom/camss/camss-vfe-4-8.c | 2 - .../media/platform/qcom/camss/camss-vfe-480.c | 45 +- drivers/media/platform/qcom/camss/camss-vfe.c | 127 ++++-- drivers/media/platform/qcom/camss/camss-vfe.h | 15 +- .../media/platform/qcom/camss/camss-video.c | 17 +- drivers/media/platform/qcom/camss/camss.c | 429 ++++++++++-------- drivers/media/platform/qcom/camss/camss.h | 34 +- 18 files changed, 450 insertions(+), 432 deletions(-) -- 2.42.0
