* [PATCH v3 0/2] destage Rockchip ISP1 driver
@ 2020-11-06 12:19 Helen Koike
2020-11-06 12:19 ` [PATCH v3 1/2] media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format Helen Koike
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Helen Koike @ 2020-11-06 12:19 UTC (permalink / raw)
To: linux-media
Cc: linux-rockchip, linux-kernel, heiko, kernel, hverkuil-cisco,
dafna.hirschfeld, zhengsq, laurent.pinchart, niklas.soderlund,
mchehab, tfiga, ribalda
Hello,
Changes in v3:
- Moved Kconfig entry from M2M to Platform devices
- Rename description and comment to Parameters and Statistics.
- Patches squashed:
dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging
media: MAINTAINERS: rkisp1: add path to dt-bindings
media: rockchip: rkisp1: destage Rockchip ISP1 driver
media: MAINTAINERS: Update rkisp1 files with new location
Changes in v2:
- New patch updating MAINTAINERS file
- No changes in other patches
> media-ctl -p
http://ix.io/2Cso
> media-ctl --print-dot
http://ix.io/2Csp
> v4l2-compliance -m0
http://ix.io/2Csk
> v4l2-compliance -v -d /dev/video0 -s10
http://ix.io/2Csq
> v4l2-compliance -v -d /dev/video1 -s10
http://ix.io/2Css
Helen Koike (1):
media: rockchip: rkisp1: destage Rockchip ISP1 driver
Shunqian Zheng (1):
media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format
.../bindings/media/rockchip-isp1.yaml | 0
.../media/v4l/pixfmt-meta-rkisp1.rst | 2 +-
MAINTAINERS | 5 ++++-
drivers/media/platform/Kconfig | 18 ++++++++++++++++++
drivers/media/platform/Makefile | 1 +
.../platform/rockchip}/rkisp1/Makefile | 0
.../rockchip}/rkisp1/rkisp1-capture.c | 0
.../platform/rockchip}/rkisp1/rkisp1-common.c | 0
.../platform/rockchip}/rkisp1/rkisp1-common.h | 2 +-
.../platform/rockchip}/rkisp1/rkisp1-dev.c | 0
.../platform/rockchip}/rkisp1/rkisp1-isp.c | 0
.../platform/rockchip}/rkisp1/rkisp1-params.c | 0
.../platform/rockchip}/rkisp1/rkisp1-regs.h | 0
.../rockchip}/rkisp1/rkisp1-resizer.c | 0
.../platform/rockchip}/rkisp1/rkisp1-stats.c | 0
drivers/media/v4l2-core/v4l2-ioctl.c | 2 ++
drivers/staging/media/Kconfig | 2 --
drivers/staging/media/Makefile | 1 -
drivers/staging/media/rkisp1/Kconfig | 19 -------------------
drivers/staging/media/rkisp1/TODO | 6 ------
.../uapi/linux}/rkisp1-config.h | 4 ----
include/uapi/linux/videodev2.h | 4 ++++
22 files changed, 31 insertions(+), 35 deletions(-)
rename {drivers/staging/media/rkisp1/Documentation => Documentation}/devicetree/bindings/media/rockchip-isp1.yaml (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/Makefile (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-capture.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.h (99%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-dev.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-isp.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-params.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-regs.h (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-resizer.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-stats.c (100%)
delete mode 100644 drivers/staging/media/rkisp1/Kconfig
delete mode 100644 drivers/staging/media/rkisp1/TODO
rename {drivers/staging/media/rkisp1/uapi => include/uapi/linux}/rkisp1-config.h (99%)
--
2.29.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/2] media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format
2020-11-06 12:19 [PATCH v3 0/2] destage Rockchip ISP1 driver Helen Koike
@ 2020-11-06 12:19 ` Helen Koike
2020-11-06 12:19 ` [PATCH v3 2/2] media: rockchip: rkisp1: destage Rockchip ISP1 driver Helen Koike
2020-11-12 10:25 ` [PATCH v3 0/2] " Dafna Hirschfeld
2 siblings, 0 replies; 6+ messages in thread
From: Helen Koike @ 2020-11-06 12:19 UTC (permalink / raw)
To: linux-media
Cc: linux-rockchip, linux-kernel, heiko, kernel, hverkuil-cisco,
dafna.hirschfeld, zhengsq, laurent.pinchart, niklas.soderlund,
mchehab, tfiga, ribalda
From: Shunqian Zheng <zhengsq@rock-chips.com>
Add the Rockchip ISP1 specific processing parameter format
V4L2_META_FMT_RK_ISP1_PARAMS and metadata format
V4L2_META_FMT_RK_ISP1_STAT_3A for 3A.
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Hello,
This patch is a continuation of:
https://patchwork.kernel.org/project/linux-arm-kernel/patch/20191106120132.6876-2-helen.koike@collabora.com/
These formats are already documented under
Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
Changes in V3:
- Rename description and comment to Parameters and Statistics.
Regards,
Helen
---
drivers/media/v4l2-core/v4l2-ioctl.c | 2 ++
drivers/staging/media/rkisp1/uapi/rkisp1-config.h | 4 ----
include/uapi/linux/videodev2.h | 4 ++++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index f0f6906a879de..3198abdd538ce 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1403,6 +1403,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break;
case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break;
case V4L2_META_FMT_VIVID: descr = "Vivid Metadata"; break;
+ case V4L2_META_FMT_RK_ISP1_PARAMS: descr = "Rockchip ISP1 3A Parameters"; break;
+ case V4L2_META_FMT_RK_ISP1_STAT_3A: descr = "Rockchip ISP1 3A Statistics"; break;
default:
/* Compressed formats */
diff --git a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h
index 8d906cc7da8fc..6e449e7842605 100644
--- a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h
+++ b/drivers/staging/media/rkisp1/uapi/rkisp1-config.h
@@ -9,10 +9,6 @@
#include <linux/types.h>
-/* Vendor specific - used for RK_ISP1 camera sub-system */
-#define V4L2_META_FMT_RK_ISP1_PARAMS v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 params */
-#define V4L2_META_FMT_RK_ISP1_STAT_3A v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A statistics */
-
/* Defect Pixel Cluster Detection */
#define RKISP1_CIF_ISP_MODULE_DPCC (1U << 0)
/* Black Level Subtraction */
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 927075fa9099e..761ac9da3ffda 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -768,6 +768,10 @@ struct v4l2_pix_format {
#define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X') /* D4XX Payload Header metadata */
#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Metadata */
+/* Vendor specific - used for RK_ISP1 camera sub-system */
+#define V4L2_META_FMT_RK_ISP1_PARAMS v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 3A Parameters */
+#define V4L2_META_FMT_RK_ISP1_STAT_3A v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A Statistics */
+
/* priv field value to indicates that subsequent fields are valid. */
#define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/2] media: rockchip: rkisp1: destage Rockchip ISP1 driver
2020-11-06 12:19 [PATCH v3 0/2] destage Rockchip ISP1 driver Helen Koike
2020-11-06 12:19 ` [PATCH v3 1/2] media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format Helen Koike
@ 2020-11-06 12:19 ` Helen Koike
2020-11-12 10:25 ` [PATCH v3 0/2] " Dafna Hirschfeld
2 siblings, 0 replies; 6+ messages in thread
From: Helen Koike @ 2020-11-06 12:19 UTC (permalink / raw)
To: linux-media
Cc: linux-rockchip, linux-kernel, heiko, kernel, hverkuil-cisco,
dafna.hirschfeld, zhengsq, laurent.pinchart, niklas.soderlund,
mchehab, tfiga, ribalda
All the items in the TODO list were addressed, uapi was reviewed,
documentation written, checkpatch errors fixed, several bugs fixed.
There is no big reason to keep this driver in staging, so move it out.
Dt-bindings Verified with:
make ARCH=arm64 dt_binding_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/media/rockchip-isp1.yaml
Fields of MAINTAINERS file sorted according to output of
./scripts/parse-maintainers.pl --input=MAINTAINERS --output=MAINTAINERS
--order
Signed-off-by: Helen Koike <helen.koike@collabora.com>
[dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging]
Acked-by: Rob Herring <robh@kernel.org>
[dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging]
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
---
Changes in v3:
- Moved Kconfig entry from M2M to Platform devices
- Patches squashed:
dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging
media: MAINTAINERS: rkisp1: add path to dt-bindings
media: rockchip: rkisp1: destage Rockchip ISP1 driver
media: MAINTAINERS: Update rkisp1 files with new location
---
.../bindings/media/rockchip-isp1.yaml | 0
.../media/v4l/pixfmt-meta-rkisp1.rst | 2 +-
MAINTAINERS | 5 ++++-
drivers/media/platform/Kconfig | 18 ++++++++++++++++++
drivers/media/platform/Makefile | 1 +
.../platform/rockchip}/rkisp1/Makefile | 0
.../rockchip}/rkisp1/rkisp1-capture.c | 0
.../platform/rockchip}/rkisp1/rkisp1-common.c | 0
.../platform/rockchip}/rkisp1/rkisp1-common.h | 2 +-
.../platform/rockchip}/rkisp1/rkisp1-dev.c | 0
.../platform/rockchip}/rkisp1/rkisp1-isp.c | 0
.../platform/rockchip}/rkisp1/rkisp1-params.c | 0
.../platform/rockchip}/rkisp1/rkisp1-regs.h | 0
.../rockchip}/rkisp1/rkisp1-resizer.c | 0
.../platform/rockchip}/rkisp1/rkisp1-stats.c | 0
drivers/staging/media/Kconfig | 2 --
drivers/staging/media/Makefile | 1 -
drivers/staging/media/rkisp1/Kconfig | 19 -------------------
drivers/staging/media/rkisp1/TODO | 6 ------
.../uapi/linux}/rkisp1-config.h | 0
20 files changed, 25 insertions(+), 31 deletions(-)
rename {drivers/staging/media/rkisp1/Documentation => Documentation}/devicetree/bindings/media/rockchip-isp1.yaml (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/Makefile (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-capture.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.h (99%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-dev.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-isp.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-params.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-regs.h (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-resizer.c (100%)
rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-stats.c (100%)
delete mode 100644 drivers/staging/media/rkisp1/Kconfig
delete mode 100644 drivers/staging/media/rkisp1/TODO
rename {drivers/staging/media/rkisp1/uapi => include/uapi/linux}/rkisp1-config.h (100%)
diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/Documentation/devicetree/bindings/media/rockchip-isp1.yaml
similarity index 100%
rename from drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml
rename to Documentation/devicetree/bindings/media/rockchip-isp1.yaml
diff --git a/Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst b/Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
index 7e43837ed260a..f3671472d4105 100644
--- a/Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
+++ b/Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
@@ -46,4 +46,4 @@ important tuning tools using software control loop.
rkisp1 uAPI data types
======================
-.. kernel-doc:: drivers/staging/media/rkisp1/uapi/rkisp1-config.h
+.. kernel-doc:: include/uapi/linux/rkisp1-config.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 811db1d3ca33b..352b8eaa21f7c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15034,10 +15034,13 @@ ROCKCHIP ISP V1 DRIVER
M: Helen Koike <helen.koike@collabora.com>
M: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
L: linux-media@vger.kernel.org
+L: linux-rockchip@lists.infradead.org
S: Maintained
F: Documentation/admin-guide/media/rkisp1.rst
+F: Documentation/devicetree/bindings/media/rockchip-isp1.yaml
F: Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst
-F: drivers/staging/media/rkisp1/
+F: drivers/media/platform/rockchip/rkisp1
+F: include/uapi/linux/rkisp1-config.h
ROCKCHIP RASTER 2D GRAPHIC ACCELERATION UNIT DRIVER
M: Jacob Chen <jacob-chen@iotwrt.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index a3cb104956d56..b161f2ba238fe 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -147,6 +147,24 @@ config VIDEO_RENESAS_CEU
help
This is a v4l2 driver for the Renesas CEU Interface
+config VIDEO_ROCKCHIP_ISP1
+ tristate "Rockchip Image Signal Processing v1 Unit driver"
+ depends on VIDEO_V4L2 && OF
+ depends on ARCH_ROCKCHIP || COMPILE_TEST
+ select MEDIA_CONTROLLER
+ select VIDEO_V4L2_SUBDEV_API
+ select VIDEOBUF2_DMA_CONTIG
+ select VIDEOBUF2_VMALLOC
+ select V4L2_FWNODE
+ select GENERIC_PHY_MIPI_DPHY
+ default n
+ help
+ Enable this to support the Image Signal Processing (ISP) module
+ present in RK3399 SoCs.
+
+ To compile this driver as a module, choose M here: the module
+ will be called rockchip-isp1.
+
source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/am437x/Kconfig"
source "drivers/media/platform/xilinx/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 62b6cdc8c7300..b342714228db4 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_VIDEO_RENESAS_FDP1) += rcar_fdp1.o
obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o
obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1/
+obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rockchip/rkisp1/
obj-$(CONFIG_VIDEO_ROCKCHIP_RGA) += rockchip/rga/
obj-y += omap/
diff --git a/drivers/staging/media/rkisp1/Makefile b/drivers/media/platform/rockchip/rkisp1/Makefile
similarity index 100%
rename from drivers/staging/media/rkisp1/Makefile
rename to drivers/media/platform/rockchip/rkisp1/Makefile
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
similarity index 100%
rename from drivers/staging/media/rkisp1/rkisp1-capture.c
rename to drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
diff --git a/drivers/staging/media/rkisp1/rkisp1-common.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.c
similarity index 100%
rename from drivers/staging/media/rkisp1/rkisp1-common.c
rename to drivers/media/platform/rockchip/rkisp1/rkisp1-common.c
diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
similarity index 99%
rename from drivers/staging/media/rkisp1/rkisp1-common.h
rename to drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 692333c66f9d1..3a134e97161cb 100644
--- a/drivers/staging/media/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -13,6 +13,7 @@
#include <linux/clk.h>
#include <linux/mutex.h>
+#include <linux/rkisp1-config.h>
#include <media/media-device.h>
#include <media/media-entity.h>
#include <media/v4l2-ctrls.h>
@@ -20,7 +21,6 @@
#include <media/videobuf2-v4l2.h>
#include "rkisp1-regs.h"
-#include "uapi/rkisp1-config.h"
/*
* flags on the 'direction' field in struct 'rkisp1_isp_mbus_info' that indicate
diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
similarity index 100%
rename from drivers/staging/media/rkisp1/rkisp1-dev.c
rename to drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
similarity index 100%
rename from drivers/staging/media/rkisp1/rkisp1-isp.c
rename to drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
similarity index 100%
rename from drivers/staging/media/rkisp1/rkisp1-params.c
rename to drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
diff --git a/drivers/staging/media/rkisp1/rkisp1-regs.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
similarity index 100%
rename from drivers/staging/media/rkisp1/rkisp1-regs.h
rename to drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
diff --git a/drivers/staging/media/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
similarity index 100%
rename from drivers/staging/media/rkisp1/rkisp1-resizer.c
rename to drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
diff --git a/drivers/staging/media/rkisp1/rkisp1-stats.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
similarity index 100%
rename from drivers/staging/media/rkisp1/rkisp1-stats.c
rename to drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 747c6cf1d795e..e8996b1c3b351 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -44,6 +44,4 @@ source "drivers/staging/media/tegra-video/Kconfig"
source "drivers/staging/media/ipu3/Kconfig"
-source "drivers/staging/media/rkisp1/Kconfig"
-
endif
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index b59571826ba69..24b5873ff7608 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -10,5 +10,4 @@ obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/
obj-$(CONFIG_TEGRA_VDE) += tegra-vde/
obj-$(CONFIG_VIDEO_HANTRO) += hantro/
obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/
-obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rkisp1/
obj-$(CONFIG_VIDEO_ZORAN) += zoran/
diff --git a/drivers/staging/media/rkisp1/Kconfig b/drivers/staging/media/rkisp1/Kconfig
deleted file mode 100644
index 41f5def9ea442..0000000000000
--- a/drivers/staging/media/rkisp1/Kconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-config VIDEO_ROCKCHIP_ISP1
- tristate "Rockchip Image Signal Processing v1 Unit driver"
- depends on VIDEO_V4L2 && OF
- depends on ARCH_ROCKCHIP || COMPILE_TEST
- select MEDIA_CONTROLLER
- select VIDEO_V4L2_SUBDEV_API
- select VIDEOBUF2_DMA_CONTIG
- select VIDEOBUF2_VMALLOC
- select V4L2_FWNODE
- select GENERIC_PHY_MIPI_DPHY
- default n
- help
- Enable this to support the Image Signal Processing (ISP) module
- present in RK3399 SoCs.
-
- To compile this driver as a module, choose M here: the module
- will be called rockchip-isp1.
diff --git a/drivers/staging/media/rkisp1/TODO b/drivers/staging/media/rkisp1/TODO
deleted file mode 100644
index bb5548cd6bd1b..0000000000000
--- a/drivers/staging/media/rkisp1/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-NOTES:
-* All v4l2-compliance test must pass.
-* Stats and params can be tested with libcamera and ChromiumOS stack.
-
-Please CC patches to Linux Media <linux-media@vger.kernel.org> and
-Helen Koike <helen.koike@collabora.com>.
diff --git a/drivers/staging/media/rkisp1/uapi/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h
similarity index 100%
rename from drivers/staging/media/rkisp1/uapi/rkisp1-config.h
rename to include/uapi/linux/rkisp1-config.h
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 0/2] destage Rockchip ISP1 driver
2020-11-06 12:19 [PATCH v3 0/2] destage Rockchip ISP1 driver Helen Koike
2020-11-06 12:19 ` [PATCH v3 1/2] media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format Helen Koike
2020-11-06 12:19 ` [PATCH v3 2/2] media: rockchip: rkisp1: destage Rockchip ISP1 driver Helen Koike
@ 2020-11-12 10:25 ` Dafna Hirschfeld
2020-11-12 12:34 ` Helen Koike
2020-11-12 12:53 ` Dave Stevenson
2 siblings, 2 replies; 6+ messages in thread
From: Dafna Hirschfeld @ 2020-11-12 10:25 UTC (permalink / raw)
To: dave.stevenson
Cc: Linux Media Mailing List, Collabora Kernel ML, Hans Verkuil, Helen Koike
Am 06.11.20 um 13:19 schrieb Helen Koike:
> Hello,
>
> Changes in v3:
> - Moved Kconfig entry from M2M to Platform devices
> - Rename description and comment to Parameters and Statistics.
> - Patches squashed:
> dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging
> media: MAINTAINERS: rkisp1: add path to dt-bindings
> media: rockchip: rkisp1: destage Rockchip ISP1 driver
> media: MAINTAINERS: Update rkisp1 files with new location
>
> Changes in v2:
> - New patch updating MAINTAINERS file
> - No changes in other patches
>
>> media-ctl -p
> http://ix.io/2Cso
>
>> media-ctl --print-dot
> http://ix.io/2Csp
>
>> v4l2-compliance -m0
> http://ix.io/2Csk
Hello Dave,
I see the above link that the imx219 does not pass the compliance:
fail: v4l2-test-controls.cpp(830): failed to find event for control 'Exposure'
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: FAIL
I see this patch on downstream
"media: i2c: imx219: Declare that the driver can create events"
That adds the flag V4L2_SUBDEV_FL_HAS_EVENTS, I suspect that is the patch
that fixes the compliance issue.
I can verify that and send the patch to the mailing list,
is it ok with you?
Thanks,
Dafna
>
>> v4l2-compliance -v -d /dev/video0 -s10
> http://ix.io/2Csq
>
>> v4l2-compliance -v -d /dev/video1 -s10
> http://ix.io/2Css
>
> Helen Koike (1):
> media: rockchip: rkisp1: destage Rockchip ISP1 driver
>
> Shunqian Zheng (1):
> media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format
>
> .../bindings/media/rockchip-isp1.yaml | 0
> .../media/v4l/pixfmt-meta-rkisp1.rst | 2 +-
> MAINTAINERS | 5 ++++-
> drivers/media/platform/Kconfig | 18 ++++++++++++++++++
> drivers/media/platform/Makefile | 1 +
> .../platform/rockchip}/rkisp1/Makefile | 0
> .../rockchip}/rkisp1/rkisp1-capture.c | 0
> .../platform/rockchip}/rkisp1/rkisp1-common.c | 0
> .../platform/rockchip}/rkisp1/rkisp1-common.h | 2 +-
> .../platform/rockchip}/rkisp1/rkisp1-dev.c | 0
> .../platform/rockchip}/rkisp1/rkisp1-isp.c | 0
> .../platform/rockchip}/rkisp1/rkisp1-params.c | 0
> .../platform/rockchip}/rkisp1/rkisp1-regs.h | 0
> .../rockchip}/rkisp1/rkisp1-resizer.c | 0
> .../platform/rockchip}/rkisp1/rkisp1-stats.c | 0
> drivers/media/v4l2-core/v4l2-ioctl.c | 2 ++
> drivers/staging/media/Kconfig | 2 --
> drivers/staging/media/Makefile | 1 -
> drivers/staging/media/rkisp1/Kconfig | 19 -------------------
> drivers/staging/media/rkisp1/TODO | 6 ------
> .../uapi/linux}/rkisp1-config.h | 4 ----
> include/uapi/linux/videodev2.h | 4 ++++
> 22 files changed, 31 insertions(+), 35 deletions(-)
> rename {drivers/staging/media/rkisp1/Documentation => Documentation}/devicetree/bindings/media/rockchip-isp1.yaml (100%)
> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/Makefile (100%)
> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-capture.c (100%)
> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.c (100%)
> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.h (99%)
> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-dev.c (100%)
> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-isp.c (100%)
> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-params.c (100%)
> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-regs.h (100%)
> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-resizer.c (100%)
> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-stats.c (100%)
> delete mode 100644 drivers/staging/media/rkisp1/Kconfig
> delete mode 100644 drivers/staging/media/rkisp1/TODO
> rename {drivers/staging/media/rkisp1/uapi => include/uapi/linux}/rkisp1-config.h (99%)
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 0/2] destage Rockchip ISP1 driver
2020-11-12 10:25 ` [PATCH v3 0/2] " Dafna Hirschfeld
@ 2020-11-12 12:34 ` Helen Koike
2020-11-12 12:53 ` Dave Stevenson
1 sibling, 0 replies; 6+ messages in thread
From: Helen Koike @ 2020-11-12 12:34 UTC (permalink / raw)
To: Dafna Hirschfeld, dave.stevenson
Cc: Linux Media Mailing List, Collabora Kernel ML, Hans Verkuil
On 11/12/20 7:25 AM, Dafna Hirschfeld wrote:
>
>
> Am 06.11.20 um 13:19 schrieb Helen Koike:
>> Hello,
>>
>> Changes in v3:
>> - Moved Kconfig entry from M2M to Platform devices
>> - Rename description and comment to Parameters and Statistics.
>> - Patches squashed:
>> dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging
>> media: MAINTAINERS: rkisp1: add path to dt-bindings
>> media: rockchip: rkisp1: destage Rockchip ISP1 driver
>> media: MAINTAINERS: Update rkisp1 files with new location
>>
>> Changes in v2:
>> - New patch updating MAINTAINERS file
>> - No changes in other patches
>>
>>> media-ctl -p
>> http://ix.io/2Cso
>>
>>> media-ctl --print-dot
>> http://ix.io/2Csp
>>
>>> v4l2-compliance -m0
>> http://ix.io/2Csk
>
> Hello Dave,
>
> I see the above link that the imx219 does not pass the compliance:
>
> fail: v4l2-test-controls.cpp(830): failed to find event for control 'Exposure'
> test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: FAIL
>
> I see this patch on downstream
> "media: i2c: imx219: Declare that the driver can create events"
>
> That adds the flag V4L2_SUBDEV_FL_HAS_EVENTS, I suspect that is the patch
> that fixes the compliance issue.
>
> I can verify that and send the patch to the mailing list,
> is it ok with you?
Sure, thanks!
Helen
>
> Thanks,
> Dafna
>
>
>
>>
>>> v4l2-compliance -v -d /dev/video0 -s10
>> http://ix.io/2Csq
>>
>>> v4l2-compliance -v -d /dev/video1 -s10
>> http://ix.io/2Css
>>
>> Helen Koike (1):
>> media: rockchip: rkisp1: destage Rockchip ISP1 driver
>>
>> Shunqian Zheng (1):
>> media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format
>>
>> .../bindings/media/rockchip-isp1.yaml | 0
>> .../media/v4l/pixfmt-meta-rkisp1.rst | 2 +-
>> MAINTAINERS | 5 ++++-
>> drivers/media/platform/Kconfig | 18 ++++++++++++++++++
>> drivers/media/platform/Makefile | 1 +
>> .../platform/rockchip}/rkisp1/Makefile | 0
>> .../rockchip}/rkisp1/rkisp1-capture.c | 0
>> .../platform/rockchip}/rkisp1/rkisp1-common.c | 0
>> .../platform/rockchip}/rkisp1/rkisp1-common.h | 2 +-
>> .../platform/rockchip}/rkisp1/rkisp1-dev.c | 0
>> .../platform/rockchip}/rkisp1/rkisp1-isp.c | 0
>> .../platform/rockchip}/rkisp1/rkisp1-params.c | 0
>> .../platform/rockchip}/rkisp1/rkisp1-regs.h | 0
>> .../rockchip}/rkisp1/rkisp1-resizer.c | 0
>> .../platform/rockchip}/rkisp1/rkisp1-stats.c | 0
>> drivers/media/v4l2-core/v4l2-ioctl.c | 2 ++
>> drivers/staging/media/Kconfig | 2 --
>> drivers/staging/media/Makefile | 1 -
>> drivers/staging/media/rkisp1/Kconfig | 19 -------------------
>> drivers/staging/media/rkisp1/TODO | 6 ------
>> .../uapi/linux}/rkisp1-config.h | 4 ----
>> include/uapi/linux/videodev2.h | 4 ++++
>> 22 files changed, 31 insertions(+), 35 deletions(-)
>> rename {drivers/staging/media/rkisp1/Documentation => Documentation}/devicetree/bindings/media/rockchip-isp1.yaml (100%)
>> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/Makefile (100%)
>> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-capture.c (100%)
>> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.c (100%)
>> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.h (99%)
>> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-dev.c (100%)
>> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-isp.c (100%)
>> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-params.c (100%)
>> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-regs.h (100%)
>> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-resizer.c (100%)
>> rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-stats.c (100%)
>> delete mode 100644 drivers/staging/media/rkisp1/Kconfig
>> delete mode 100644 drivers/staging/media/rkisp1/TODO
>> rename {drivers/staging/media/rkisp1/uapi => include/uapi/linux}/rkisp1-config.h (99%)
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 0/2] destage Rockchip ISP1 driver
2020-11-12 10:25 ` [PATCH v3 0/2] " Dafna Hirschfeld
2020-11-12 12:34 ` Helen Koike
@ 2020-11-12 12:53 ` Dave Stevenson
1 sibling, 0 replies; 6+ messages in thread
From: Dave Stevenson @ 2020-11-12 12:53 UTC (permalink / raw)
To: Dafna Hirschfeld
Cc: Linux Media Mailing List, Collabora Kernel ML, Hans Verkuil, Helen Koike
On Thu, 12 Nov 2020 at 10:25, Dafna Hirschfeld
<dafna.hirschfeld@collabora.com> wrote:
>
>
>
> Am 06.11.20 um 13:19 schrieb Helen Koike:
> > Hello,
> >
> > Changes in v3:
> > - Moved Kconfig entry from M2M to Platform devices
> > - Rename description and comment to Parameters and Statistics.
> > - Patches squashed:
> > dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging
> > media: MAINTAINERS: rkisp1: add path to dt-bindings
> > media: rockchip: rkisp1: destage Rockchip ISP1 driver
> > media: MAINTAINERS: Update rkisp1 files with new location
> >
> > Changes in v2:
> > - New patch updating MAINTAINERS file
> > - No changes in other patches
> >
> >> media-ctl -p
> > http://ix.io/2Cso
> >
> >> media-ctl --print-dot
> > http://ix.io/2Csp
> >
> >> v4l2-compliance -m0
> > http://ix.io/2Csk
>
> Hello Dave,
Hi Dafna
> I see the above link that the imx219 does not pass the compliance:
>
> fail: v4l2-test-controls.cpp(830): failed to find event for control 'Exposure'
> test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: FAIL
>
> I see this patch on downstream
> "media: i2c: imx219: Declare that the driver can create events"
>
> That adds the flag V4L2_SUBDEV_FL_HAS_EVENTS, I suspect that is the patch
> that fixes the compliance issue.
>
> I can verify that and send the patch to the mailing list,
> is it ok with you?
Fine by me.
Dave
> Thanks,
> Dafna
>
>
>
> >
> >> v4l2-compliance -v -d /dev/video0 -s10
> > http://ix.io/2Csq
> >
> >> v4l2-compliance -v -d /dev/video1 -s10
> > http://ix.io/2Css
> >
> > Helen Koike (1):
> > media: rockchip: rkisp1: destage Rockchip ISP1 driver
> >
> > Shunqian Zheng (1):
> > media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format
> >
> > .../bindings/media/rockchip-isp1.yaml | 0
> > .../media/v4l/pixfmt-meta-rkisp1.rst | 2 +-
> > MAINTAINERS | 5 ++++-
> > drivers/media/platform/Kconfig | 18 ++++++++++++++++++
> > drivers/media/platform/Makefile | 1 +
> > .../platform/rockchip}/rkisp1/Makefile | 0
> > .../rockchip}/rkisp1/rkisp1-capture.c | 0
> > .../platform/rockchip}/rkisp1/rkisp1-common.c | 0
> > .../platform/rockchip}/rkisp1/rkisp1-common.h | 2 +-
> > .../platform/rockchip}/rkisp1/rkisp1-dev.c | 0
> > .../platform/rockchip}/rkisp1/rkisp1-isp.c | 0
> > .../platform/rockchip}/rkisp1/rkisp1-params.c | 0
> > .../platform/rockchip}/rkisp1/rkisp1-regs.h | 0
> > .../rockchip}/rkisp1/rkisp1-resizer.c | 0
> > .../platform/rockchip}/rkisp1/rkisp1-stats.c | 0
> > drivers/media/v4l2-core/v4l2-ioctl.c | 2 ++
> > drivers/staging/media/Kconfig | 2 --
> > drivers/staging/media/Makefile | 1 -
> > drivers/staging/media/rkisp1/Kconfig | 19 -------------------
> > drivers/staging/media/rkisp1/TODO | 6 ------
> > .../uapi/linux}/rkisp1-config.h | 4 ----
> > include/uapi/linux/videodev2.h | 4 ++++
> > 22 files changed, 31 insertions(+), 35 deletions(-)
> > rename {drivers/staging/media/rkisp1/Documentation => Documentation}/devicetree/bindings/media/rockchip-isp1.yaml (100%)
> > rename drivers/{staging/media => media/platform/rockchip}/rkisp1/Makefile (100%)
> > rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-capture.c (100%)
> > rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.c (100%)
> > rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-common.h (99%)
> > rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-dev.c (100%)
> > rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-isp.c (100%)
> > rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-params.c (100%)
> > rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-regs.h (100%)
> > rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-resizer.c (100%)
> > rename drivers/{staging/media => media/platform/rockchip}/rkisp1/rkisp1-stats.c (100%)
> > delete mode 100644 drivers/staging/media/rkisp1/Kconfig
> > delete mode 100644 drivers/staging/media/rkisp1/TODO
> > rename {drivers/staging/media/rkisp1/uapi => include/uapi/linux}/rkisp1-config.h (99%)
> >
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-12 12:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-06 12:19 [PATCH v3 0/2] destage Rockchip ISP1 driver Helen Koike
2020-11-06 12:19 ` [PATCH v3 1/2] media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format Helen Koike
2020-11-06 12:19 ` [PATCH v3 2/2] media: rockchip: rkisp1: destage Rockchip ISP1 driver Helen Koike
2020-11-12 10:25 ` [PATCH v3 0/2] " Dafna Hirschfeld
2020-11-12 12:34 ` Helen Koike
2020-11-12 12:53 ` Dave Stevenson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).