Message ID | 20191114051242.14651-1-helen.koike@collabora.com (mailing list archive) |
---|---|
Headers | show |
Series | Rockchip ISP Driver | expand |
On Thu, Nov 14, 2019 at 02:12:31AM -0300, Helen Koike wrote: > Hello, > > This series adds the Rockchip Image Signal Processing Unit v1 driver to > staging. > > The main reason to be in staging is that people are already using it from the > mailing list (including libcamera), and having it in mainline makes the workflow > easier. Also, it is easier for other people to contribute back (with code > or testing the driver). > > We plan to actively work on this driver to get it our of staging. > > This patchset is also available at: > https://gitlab.collabora.com/koike/linux/tree/rockchip/isp/v11 > > Libcamera patched to work with this version: > https://gitlab.collabora.com/koike/libcamera > (also sent to the mailing list) > > The major difference in v11 are: > - Fixed compiling warnings found with W=1 > - Fixed checkpatch errors > - Add clock-names values in dt-bindings > > This series only touches MAINTAINERS file and drivers/staging/ Looks sane, but as this is drivers/staging/media I am guessing this will go through the media kernel tree, not my staging tree, right? thanks, greg k-h
On 11/14/19 6:17 AM, Greg KH wrote: > On Thu, Nov 14, 2019 at 02:12:31AM -0300, Helen Koike wrote: >> Hello, >> >> This series adds the Rockchip Image Signal Processing Unit v1 driver to >> staging. >> >> The main reason to be in staging is that people are already using it from the >> mailing list (including libcamera), and having it in mainline makes the workflow >> easier. Also, it is easier for other people to contribute back (with code >> or testing the driver). >> >> We plan to actively work on this driver to get it our of staging. >> >> This patchset is also available at: >> https://gitlab.collabora.com/koike/linux/tree/rockchip/isp/v11 >> >> Libcamera patched to work with this version: >> https://gitlab.collabora.com/koike/libcamera >> (also sent to the mailing list) >> >> The major difference in v11 are: >> - Fixed compiling warnings found with W=1 >> - Fixed checkpatch errors >> - Add clock-names values in dt-bindings >> >> This series only touches MAINTAINERS file and drivers/staging/ > > Looks sane, but as this is drivers/staging/media I am guessing this will > go through the media kernel tree, not my staging tree, right? Right, I'll take care of this. Regards, Hans
On 11/14/19 6:12 AM, Helen Koike wrote: > Hello, > > This series adds the Rockchip Image Signal Processing Unit v1 driver to > staging. > > The main reason to be in staging is that people are already using it from the > mailing list (including libcamera), and having it in mainline makes the workflow > easier. Also, it is easier for other people to contribute back (with code > or testing the driver). > > We plan to actively work on this driver to get it our of staging. > > This patchset is also available at: > https://gitlab.collabora.com/koike/linux/tree/rockchip/isp/v11 > > Libcamera patched to work with this version: > https://gitlab.collabora.com/koike/libcamera > (also sent to the mailing list) > > The major difference in v11 are: > - Fixed compiling warnings found with W=1 > - Fixed checkpatch errors > - Add clock-names values in dt-bindings Looking at checkpatch I see a few remaining issues that I believe should be fixed before merging this: CHECK: spinlock_t definition without comment #575: FILE: drivers/staging/media/rkisp1/isp_stats.h:43: + spinlock_t irq_lock; CHECK: struct mutex definition without comment #581: FILE: drivers/staging/media/rkisp1/isp_stats.h:49: + struct mutex wq_lock; CHECK: spinlock_t definition without comment #1648: FILE: drivers/staging/media/rkisp1/isp_params.h:25: + spinlock_t config_lock; CHECK: spinlock_t definition without comment #2058: FILE: drivers/staging/media/rkisp1/capture.h:145: + spinlock_t vbq_lock; Once this is done together with the Jacob Chen email clarification it is ready to be merged for v5.6. It passes all the sparse/smatch tests, so that's very good. Regards, Hans > > This series only touches MAINTAINERS file and drivers/staging/ > > MAINTAINERS > drivers/staging/media/Kconfig > drivers/staging/media/Makefile > drivers/staging/media/phy-rockchip-dphy/Kconfig > drivers/staging/media/phy-rockchip-dphy/Makefile > drivers/staging/media/phy-rockchip-dphy/TODO > drivers/staging/media/phy-rockchip-dphy/phy-rockchip-dphy.c > drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.txt > drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-mipi-dphy.txt > drivers/staging/media/rkisp1/Documentation/media/uapi/v4l/pixfmt-meta-rkisp1-params.rst > drivers/staging/media/rkisp1/Documentation/media/uapi/v4l/pixfmt-meta-rkisp1-stat.rst > drivers/staging/media/rkisp1/Kconfig > drivers/staging/media/rkisp1/Makefile > drivers/staging/media/rkisp1/TODO > drivers/staging/media/rkisp1/capture.c > drivers/staging/media/rkisp1/capture.h > drivers/staging/media/rkisp1/common.h > drivers/staging/media/rkisp1/dev.c > drivers/staging/media/rkisp1/dev.h > drivers/staging/media/rkisp1/isp_params.c > drivers/staging/media/rkisp1/isp_params.h > drivers/staging/media/rkisp1/isp_stats.c > drivers/staging/media/rkisp1/isp_stats.h > drivers/staging/media/rkisp1/regs.c > drivers/staging/media/rkisp1/regs.h > drivers/staging/media/rkisp1/rkisp1.c > drivers/staging/media/rkisp1/rkisp1.h > drivers/staging/media/rkisp1/uapi/rkisp1-config.h > > Two drivers were added, including a TODO list for removing it from > staging: > > * phy-rockchip-dphy: mipi dphy driver used by csi > * rkisp1: the image signal processing unit driver > > Thanks > Helen > > Changes in v11: > dphy > - fix checkpatch errors > - fix checkpatch errors > rkisp1 > - Fix compiling warnings > - Fix checkpatch errors > stats > - fix compiling warnings > - fix checkpatch errors > params > - fix compiling warnings > - fix checkpatch errors > capture > - fix checkpatch errors > dev > - fix checkpatch erros > dt-bidings: > - add clock-names values > > Helen Koike (1): > MAINTAINERS: add entry for Rockchip ISP1 driver > > Jacob Chen (9): > media: staging: phy-rockchip-dphy: add Rockchip MIPI Synopsys DPHY > driver > media: staging: rkisp1: add document for rkisp1 meta buffer format > media: staging: rkisp1: add Rockchip ISP1 subdev driver > media: staging: rkisp1: add ISP1 statistics driver > media: staging: rkisp1: add ISP1 params driver > media: staging: rkisp1: add capture device driver > media: staging: rkisp1: add rockchip isp1 core driver > media: staging: dt-bindings: Document the Rockchip ISP1 bindings > media: staging: dt-bindings: Document the Rockchip MIPI RX D-PHY > bindings > > Jeffy Chen (1): > media: staging: rkisp1: add user space ABI definitions > > MAINTAINERS | 6 + > drivers/staging/media/Kconfig | 4 + > drivers/staging/media/Makefile | 2 + > .../staging/media/phy-rockchip-dphy/Kconfig | 11 + > .../staging/media/phy-rockchip-dphy/Makefile | 2 + > drivers/staging/media/phy-rockchip-dphy/TODO | 6 + > .../phy-rockchip-dphy/phy-rockchip-dphy.c | 401 ++++ > .../bindings/media/rockchip-isp1.txt | 77 + > .../bindings/media/rockchip-mipi-dphy.txt | 38 + > .../uapi/v4l/pixfmt-meta-rkisp1-params.rst | 23 + > .../uapi/v4l/pixfmt-meta-rkisp1-stat.rst | 22 + > drivers/staging/media/rkisp1/Kconfig | 13 + > drivers/staging/media/rkisp1/Makefile | 7 + > drivers/staging/media/rkisp1/TODO | 23 + > drivers/staging/media/rkisp1/capture.c | 1871 +++++++++++++++++ > drivers/staging/media/rkisp1/capture.h | 164 ++ > drivers/staging/media/rkisp1/common.h | 98 + > drivers/staging/media/rkisp1/dev.c | 439 ++++ > drivers/staging/media/rkisp1/dev.h | 67 + > drivers/staging/media/rkisp1/isp_params.c | 1586 ++++++++++++++ > drivers/staging/media/rkisp1/isp_params.h | 50 + > drivers/staging/media/rkisp1/isp_stats.c | 495 +++++ > drivers/staging/media/rkisp1/isp_stats.h | 60 + > drivers/staging/media/rkisp1/regs.c | 224 ++ > drivers/staging/media/rkisp1/regs.h | 1525 ++++++++++++++ > drivers/staging/media/rkisp1/rkisp1.c | 1243 +++++++++++ > drivers/staging/media/rkisp1/rkisp1.h | 97 + > .../staging/media/rkisp1/uapi/rkisp1-config.h | 819 ++++++++ > 28 files changed, 9373 insertions(+) > create mode 100644 drivers/staging/media/phy-rockchip-dphy/Kconfig > create mode 100644 drivers/staging/media/phy-rockchip-dphy/Makefile > create mode 100644 drivers/staging/media/phy-rockchip-dphy/TODO > create mode 100644 drivers/staging/media/phy-rockchip-dphy/phy-rockchip-dphy.c > create mode 100644 drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.txt > create mode 100644 drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-mipi-dphy.txt > create mode 100644 drivers/staging/media/rkisp1/Documentation/media/uapi/v4l/pixfmt-meta-rkisp1-params.rst > create mode 100644 drivers/staging/media/rkisp1/Documentation/media/uapi/v4l/pixfmt-meta-rkisp1-stat.rst > create mode 100644 drivers/staging/media/rkisp1/Kconfig > create mode 100644 drivers/staging/media/rkisp1/Makefile > create mode 100644 drivers/staging/media/rkisp1/TODO > create mode 100644 drivers/staging/media/rkisp1/capture.c > create mode 100644 drivers/staging/media/rkisp1/capture.h > create mode 100644 drivers/staging/media/rkisp1/common.h > create mode 100644 drivers/staging/media/rkisp1/dev.c > create mode 100644 drivers/staging/media/rkisp1/dev.h > create mode 100644 drivers/staging/media/rkisp1/isp_params.c > create mode 100644 drivers/staging/media/rkisp1/isp_params.h > create mode 100644 drivers/staging/media/rkisp1/isp_stats.c > create mode 100644 drivers/staging/media/rkisp1/isp_stats.h > create mode 100644 drivers/staging/media/rkisp1/regs.c > create mode 100644 drivers/staging/media/rkisp1/regs.h > create mode 100644 drivers/staging/media/rkisp1/rkisp1.c > create mode 100644 drivers/staging/media/rkisp1/rkisp1.h > create mode 100644 drivers/staging/media/rkisp1/uapi/rkisp1-config.h >
Hi Hans, Thanks for taking care of this. On Thu, 2019-11-14 at 09:42 +0100, Hans Verkuil wrote: > On 11/14/19 6:12 AM, Helen Koike wrote: > > Hello, > > > > This series adds the Rockchip Image Signal Processing Unit v1 driver to > > staging. > > > > The main reason to be in staging is that people are already using it from the > > mailing list (including libcamera), and having it in mainline makes the workflow > > easier. Also, it is easier for other people to contribute back (with code > > or testing the driver). > > > > We plan to actively work on this driver to get it our of staging. > > > > This patchset is also available at: > > https://gitlab.collabora.com/koike/linux/tree/rockchip/isp/v11 > > > > Libcamera patched to work with this version: > > https://gitlab.collabora.com/koike/libcamera > > (also sent to the mailing list) > > > > The major difference in v11 are: > > - Fixed compiling warnings found with W=1 > > - Fixed checkpatch errors > > - Add clock-names values in dt-bindings > > Looking at checkpatch I see a few remaining issues that I believe should be > fixed before merging this: > > CHECK: spinlock_t definition without comment > #575: FILE: drivers/staging/media/rkisp1/isp_stats.h:43: > + spinlock_t irq_lock; > > CHECK: struct mutex definition without comment > #581: FILE: drivers/staging/media/rkisp1/isp_stats.h:49: > + struct mutex wq_lock; > > CHECK: spinlock_t definition without comment > #1648: FILE: drivers/staging/media/rkisp1/isp_params.h:25: > + spinlock_t config_lock; > > CHECK: spinlock_t definition without comment > #2058: FILE: drivers/staging/media/rkisp1/capture.h:145: > + spinlock_t vbq_lock; > I'd rather merge this as-is, adding a TODO entry stating we need to revisit locking specifically, because I'd like to take a close look at these spinlocks/mutex, instead of just addding comments for then. > Once this is done together with the Jacob Chen email clarification > it is ready to be merged for v5.6. > I'll find out more about this. > It passes all the sparse/smatch tests, so that's very good. > Great! Thanks, Ezequiel
On 11/18/19 7:52 PM, Ezequiel Garcia wrote: > Hi Hans, > > Thanks for taking care of this. > > On Thu, 2019-11-14 at 09:42 +0100, Hans Verkuil wrote: >> On 11/14/19 6:12 AM, Helen Koike wrote: >>> Hello, >>> >>> This series adds the Rockchip Image Signal Processing Unit v1 driver to >>> staging. >>> >>> The main reason to be in staging is that people are already using it from the >>> mailing list (including libcamera), and having it in mainline makes the workflow >>> easier. Also, it is easier for other people to contribute back (with code >>> or testing the driver). >>> >>> We plan to actively work on this driver to get it our of staging. >>> >>> This patchset is also available at: >>> https://gitlab.collabora.com/koike/linux/tree/rockchip/isp/v11 >>> >>> Libcamera patched to work with this version: >>> https://gitlab.collabora.com/koike/libcamera >>> (also sent to the mailing list) >>> >>> The major difference in v11 are: >>> - Fixed compiling warnings found with W=1 >>> - Fixed checkpatch errors >>> - Add clock-names values in dt-bindings >> >> Looking at checkpatch I see a few remaining issues that I believe should be >> fixed before merging this: >> >> CHECK: spinlock_t definition without comment >> #575: FILE: drivers/staging/media/rkisp1/isp_stats.h:43: >> + spinlock_t irq_lock; >> >> CHECK: struct mutex definition without comment >> #581: FILE: drivers/staging/media/rkisp1/isp_stats.h:49: >> + struct mutex wq_lock; >> >> CHECK: spinlock_t definition without comment >> #1648: FILE: drivers/staging/media/rkisp1/isp_params.h:25: >> + spinlock_t config_lock; >> >> CHECK: spinlock_t definition without comment >> #2058: FILE: drivers/staging/media/rkisp1/capture.h:145: >> + spinlock_t vbq_lock; >> > > I'd rather merge this as-is, adding a TODO entry stating > we need to revisit locking specifically, because I'd like > to take a close look at these spinlocks/mutex, > instead of just addding comments for then. Fair enough! Just as long as it is mentioned somewhere. > >> Once this is done together with the Jacob Chen email clarification >> it is ready to be merged for v5.6. >> > > I'll find out more about this. Thanks! Remember that we are in the code freeze until v5.5-rc1 is released, so you have time to make more adjustments if you want to. Regards, Hans > >> It passes all the sparse/smatch tests, so that's very good. >> > > Great! > > Thanks, > Ezequiel >
Hi Helen, Ezequiel, The merge window is open, so you want to get this in, then please post a v12 with the few remaining items addressed so that I can merge it. Regards, Hans On 11/19/19 9:30 AM, Hans Verkuil wrote: > On 11/18/19 7:52 PM, Ezequiel Garcia wrote: >> Hi Hans, >> >> Thanks for taking care of this. >> >> On Thu, 2019-11-14 at 09:42 +0100, Hans Verkuil wrote: >>> On 11/14/19 6:12 AM, Helen Koike wrote: >>>> Hello, >>>> >>>> This series adds the Rockchip Image Signal Processing Unit v1 driver to >>>> staging. >>>> >>>> The main reason to be in staging is that people are already using it from the >>>> mailing list (including libcamera), and having it in mainline makes the workflow >>>> easier. Also, it is easier for other people to contribute back (with code >>>> or testing the driver). >>>> >>>> We plan to actively work on this driver to get it our of staging. >>>> >>>> This patchset is also available at: >>>> https://gitlab.collabora.com/koike/linux/tree/rockchip/isp/v11 >>>> >>>> Libcamera patched to work with this version: >>>> https://gitlab.collabora.com/koike/libcamera >>>> (also sent to the mailing list) >>>> >>>> The major difference in v11 are: >>>> - Fixed compiling warnings found with W=1 >>>> - Fixed checkpatch errors >>>> - Add clock-names values in dt-bindings >>> >>> Looking at checkpatch I see a few remaining issues that I believe should be >>> fixed before merging this: >>> >>> CHECK: spinlock_t definition without comment >>> #575: FILE: drivers/staging/media/rkisp1/isp_stats.h:43: >>> + spinlock_t irq_lock; >>> >>> CHECK: struct mutex definition without comment >>> #581: FILE: drivers/staging/media/rkisp1/isp_stats.h:49: >>> + struct mutex wq_lock; >>> >>> CHECK: spinlock_t definition without comment >>> #1648: FILE: drivers/staging/media/rkisp1/isp_params.h:25: >>> + spinlock_t config_lock; >>> >>> CHECK: spinlock_t definition without comment >>> #2058: FILE: drivers/staging/media/rkisp1/capture.h:145: >>> + spinlock_t vbq_lock; >>> >> >> I'd rather merge this as-is, adding a TODO entry stating >> we need to revisit locking specifically, because I'd like >> to take a close look at these spinlocks/mutex, >> instead of just addding comments for then. > > Fair enough! Just as long as it is mentioned somewhere. > >> >>> Once this is done together with the Jacob Chen email clarification >>> it is ready to be merged for v5.6. >>> >> >> I'll find out more about this. > > Thanks! > > Remember that we are in the code freeze until v5.5-rc1 is released, > so you have time to make more adjustments if you want to. > > Regards, > > Hans > >> >>> It passes all the sparse/smatch tests, so that's very good. >>> >> >> Great! >> >> Thanks, >> Ezequiel >> >