* [PATCH 1/4] media: staging: rkisp1: cap: fix issues when writing to uv swap register
2020-03-26 20:16 [PATCH 0/4] media: staging: rkisp1: cap: various fixes for capture formats Dafna Hirschfeld
@ 2020-03-26 20:16 ` Dafna Hirschfeld
2020-03-30 19:11 ` Helen Koike
2020-03-26 20:16 ` [PATCH 2/4] media: staging: rkisp1: cap: support uv swap only for semiplanar formats Dafna Hirschfeld
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Dafna Hirschfeld @ 2020-03-26 20:16 UTC (permalink / raw)
To: linux-media, dafna.hirschfeld, helen.koike, ezequiel, hverkuil,
kernel, dafna3, sakari.ailus, linux-rockchip, mchehab,
laurent.pinchart
When writing to the RKISP1_CIF_MI_XTD_FORMAT_CTRL register
in mainpath, a redundant mask that clears the related swap
flag is applied and then the flag is set again.
In the selfpath, a mask that clears the swap setting is applied
instead of adding the setting.
This patch fixes those issues by just adding the swap setting.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/staging/media/rkisp1/rkisp1-capture.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index 45d237a77ca4..84a3cf565106 100644
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -432,8 +432,7 @@ static void rkisp1_mp_config(struct rkisp1_capture *cap)
if (cap->pix.cfg->uv_swap) {
reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
- reg = (reg & ~BIT(0)) |
- RKISP1_CIF_MI_XTD_FMT_CTRL_MP_CB_CR_SWAP;
+ reg = reg | RKISP1_CIF_MI_XTD_FMT_CTRL_MP_CB_CR_SWAP;
rkisp1_write(rkisp1, reg, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
}
@@ -470,8 +469,8 @@ static void rkisp1_sp_config(struct rkisp1_capture *cap)
if (cap->pix.cfg->uv_swap) {
u32 reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
- rkisp1_write(rkisp1, reg & ~BIT(1),
- RKISP1_CIF_MI_XTD_FORMAT_CTRL);
+ reg = reg | RKISP1_CIF_MI_XTD_FMT_CTRL_SP_CB_CR_SWAP;
+ rkisp1_write(rkisp1, reg, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
}
rkisp1_mi_config_ctrl(cap);
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] media: staging: rkisp1: cap: fix issues when writing to uv swap register
2020-03-26 20:16 ` [PATCH 1/4] media: staging: rkisp1: cap: fix issues when writing to uv swap register Dafna Hirschfeld
@ 2020-03-30 19:11 ` Helen Koike
0 siblings, 0 replies; 9+ messages in thread
From: Helen Koike @ 2020-03-30 19:11 UTC (permalink / raw)
To: Dafna Hirschfeld, linux-media, ezequiel, hverkuil, kernel,
dafna3, sakari.ailus, linux-rockchip, mchehab, laurent.pinchart
Hi Dafna,
Thanks for your patch.
On 3/26/20 5:16 PM, Dafna Hirschfeld wrote:
> When writing to the RKISP1_CIF_MI_XTD_FORMAT_CTRL register
> in mainpath, a redundant mask that clears the related swap
> flag is applied and then the flag is set again.
>
> In the selfpath, a mask that clears the swap setting is applied
> instead of adding the setting.
> This patch fixes those issues by just adding the swap setting.
One is a clean-up, and the other one is a bug fix.
Could you please split those in two separated patches?
It is better for tracking bugs and bisectability to not mix
cleanups with fixes.
Thanks
Helen
>
> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
> ---
> drivers/staging/media/rkisp1/rkisp1-capture.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
> index 45d237a77ca4..84a3cf565106 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-capture.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
> @@ -432,8 +432,7 @@ static void rkisp1_mp_config(struct rkisp1_capture *cap)
> if (cap->pix.cfg->uv_swap) {
> reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
>
> - reg = (reg & ~BIT(0)) |
> - RKISP1_CIF_MI_XTD_FMT_CTRL_MP_CB_CR_SWAP;
> + reg = reg | RKISP1_CIF_MI_XTD_FMT_CTRL_MP_CB_CR_SWAP;
> rkisp1_write(rkisp1, reg, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
> }
>
> @@ -470,8 +469,8 @@ static void rkisp1_sp_config(struct rkisp1_capture *cap)
> if (cap->pix.cfg->uv_swap) {
> u32 reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
>
> - rkisp1_write(rkisp1, reg & ~BIT(1),
> - RKISP1_CIF_MI_XTD_FORMAT_CTRL);
> + reg = reg | RKISP1_CIF_MI_XTD_FMT_CTRL_SP_CB_CR_SWAP;
> + rkisp1_write(rkisp1, reg, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
> }
>
> rkisp1_mi_config_ctrl(cap);
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/4] media: staging: rkisp1: cap: support uv swap only for semiplanar formats
2020-03-26 20:16 [PATCH 0/4] media: staging: rkisp1: cap: various fixes for capture formats Dafna Hirschfeld
2020-03-26 20:16 ` [PATCH 1/4] media: staging: rkisp1: cap: fix issues when writing to uv swap register Dafna Hirschfeld
@ 2020-03-26 20:16 ` Dafna Hirschfeld
2020-03-30 19:12 ` Helen Koike
2020-03-26 20:16 ` [PATCH 3/4] media: staging: rkisp1: cap: support uv swapped plane formats Dafna Hirschfeld
2020-03-26 20:16 ` [PATCH 4/4] media: staging: rkisp1: cap: remove unsupported formats Dafna Hirschfeld
3 siblings, 1 reply; 9+ messages in thread
From: Dafna Hirschfeld @ 2020-03-26 20:16 UTC (permalink / raw)
To: linux-media, dafna.hirschfeld, helen.koike, ezequiel, hverkuil,
kernel, dafna3, sakari.ailus, linux-rockchip, mchehab,
laurent.pinchart
The register RKISP1_CIF_MI_XTD_FORMAT_CTRL is relevant only
for semiplanar formats, therefore the uv swap can be supported
through this register only for semiplanar formats.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/staging/media/rkisp1/rkisp1-capture.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index 84a3cf565106..fa2849209433 100644
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -37,6 +37,10 @@
#define RKISP1_MIN_BUFFERS_NEEDED 3
+#define RKISP1_IS_SEMI_PLANAR(write_format) \
+ (((write_format) == RKISP1_MI_CTRL_MP_WRITE_YUV_SPLA) || \
+ ((write_format) == RKISP1_MI_CTRL_SP_WRITE_SPLA))
+
enum rkisp1_plane {
RKISP1_PLANE_Y = 0,
RKISP1_PLANE_CB = 1,
@@ -429,7 +433,8 @@ static void rkisp1_mp_config(struct rkisp1_capture *cap)
cap->config->mi.cr_size_init);
rkisp1_irq_frame_end_enable(cap);
- if (cap->pix.cfg->uv_swap) {
+ if (RKISP1_IS_SEMI_PLANAR(cap->pix.cfg->write_format) &&
+ cap->pix.cfg->uv_swap) {
reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
reg = reg | RKISP1_CIF_MI_XTD_FMT_CTRL_MP_CB_CR_SWAP;
@@ -466,7 +471,8 @@ static void rkisp1_sp_config(struct rkisp1_capture *cap)
rkisp1_write(rkisp1, cap->sp_y_stride, RKISP1_CIF_MI_SP_Y_LLENGTH);
rkisp1_irq_frame_end_enable(cap);
- if (cap->pix.cfg->uv_swap) {
+ if (RKISP1_IS_SEMI_PLANAR(cap->pix.cfg->write_format) &&
+ cap->pix.cfg->uv_swap) {
u32 reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
reg = reg | RKISP1_CIF_MI_XTD_FMT_CTRL_SP_CB_CR_SWAP;
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/4] media: staging: rkisp1: cap: support uv swap only for semiplanar formats
2020-03-26 20:16 ` [PATCH 2/4] media: staging: rkisp1: cap: support uv swap only for semiplanar formats Dafna Hirschfeld
@ 2020-03-30 19:12 ` Helen Koike
0 siblings, 0 replies; 9+ messages in thread
From: Helen Koike @ 2020-03-30 19:12 UTC (permalink / raw)
To: Dafna Hirschfeld, linux-media, ezequiel, hverkuil, kernel,
dafna3, sakari.ailus, linux-rockchip, mchehab, laurent.pinchart
On 3/26/20 5:16 PM, Dafna Hirschfeld wrote:
> The register RKISP1_CIF_MI_XTD_FORMAT_CTRL is relevant only
> for semiplanar formats, therefore the uv swap can be supported
> through this register only for semiplanar formats.
>
> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
> ---
> drivers/staging/media/rkisp1/rkisp1-capture.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
> index 84a3cf565106..fa2849209433 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-capture.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
> @@ -37,6 +37,10 @@
>
> #define RKISP1_MIN_BUFFERS_NEEDED 3
>
> +#define RKISP1_IS_SEMI_PLANAR(write_format) \
> + (((write_format) == RKISP1_MI_CTRL_MP_WRITE_YUV_SPLA) || \
> + ((write_format) == RKISP1_MI_CTRL_SP_WRITE_SPLA))
> +
> enum rkisp1_plane {
> RKISP1_PLANE_Y = 0,
> RKISP1_PLANE_CB = 1,
> @@ -429,7 +433,8 @@ static void rkisp1_mp_config(struct rkisp1_capture *cap)
> cap->config->mi.cr_size_init);
>
> rkisp1_irq_frame_end_enable(cap);
> - if (cap->pix.cfg->uv_swap) {
> + if (RKISP1_IS_SEMI_PLANAR(cap->pix.cfg->write_format) &&
> + cap->pix.cfg->uv_swap) {
> reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
>
> reg = reg | RKISP1_CIF_MI_XTD_FMT_CTRL_MP_CB_CR_SWAP;
> @@ -466,7 +471,8 @@ static void rkisp1_sp_config(struct rkisp1_capture *cap)
> rkisp1_write(rkisp1, cap->sp_y_stride, RKISP1_CIF_MI_SP_Y_LLENGTH);
>
> rkisp1_irq_frame_end_enable(cap);
> - if (cap->pix.cfg->uv_swap) {
> + if (RKISP1_IS_SEMI_PLANAR(cap->pix.cfg->write_format) &&
> + cap->pix.cfg->uv_swap) {
> u32 reg = rkisp1_read(rkisp1, RKISP1_CIF_MI_XTD_FORMAT_CTRL);
>
> reg = reg | RKISP1_CIF_MI_XTD_FMT_CTRL_SP_CB_CR_SWAP;
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/4] media: staging: rkisp1: cap: support uv swapped plane formats
2020-03-26 20:16 [PATCH 0/4] media: staging: rkisp1: cap: various fixes for capture formats Dafna Hirschfeld
2020-03-26 20:16 ` [PATCH 1/4] media: staging: rkisp1: cap: fix issues when writing to uv swap register Dafna Hirschfeld
2020-03-26 20:16 ` [PATCH 2/4] media: staging: rkisp1: cap: support uv swap only for semiplanar formats Dafna Hirschfeld
@ 2020-03-26 20:16 ` Dafna Hirschfeld
2020-03-30 19:13 ` Helen Koike
2020-03-26 20:16 ` [PATCH 4/4] media: staging: rkisp1: cap: remove unsupported formats Dafna Hirschfeld
3 siblings, 1 reply; 9+ messages in thread
From: Dafna Hirschfeld @ 2020-03-26 20:16 UTC (permalink / raw)
To: linux-media, dafna.hirschfeld, helen.koike, ezequiel, hverkuil,
kernel, dafna3, sakari.ailus, linux-rockchip, mchehab,
laurent.pinchart
Plane formats with the u and v planes swapped can be
supported by changing the address of the cb and cr in
the buffer.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/staging/media/rkisp1/rkisp1-capture.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index fa2849209433..2d274e8f565b 100644
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -41,6 +41,10 @@
(((write_format) == RKISP1_MI_CTRL_MP_WRITE_YUV_SPLA) || \
((write_format) == RKISP1_MI_CTRL_SP_WRITE_SPLA))
+#define RKISP1_IS_PLANAR(write_format) \
+ (((write_format) == RKISP1_MI_CTRL_SP_WRITE_PLA) || \
+ ((write_format) == RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8))
+
enum rkisp1_plane {
RKISP1_PLANE_Y = 0,
RKISP1_PLANE_CB = 1,
@@ -788,6 +792,19 @@ static void rkisp1_vb2_buf_queue(struct vb2_buffer *vb)
rkisp1_pixfmt_comp_size(pixm, RKISP1_PLANE_CB);
}
+ /*
+ * uv swap can be supported for plane formats by switching
+ * the address of cb and cr
+ */
+ if (RKISP1_IS_PLANAR(cap->pix.cfg->write_format) &&
+ cap->pix.cfg->uv_swap) {
+ ispbuf->buff_addr[RKISP1_PLANE_CR] =
+ ispbuf->buff_addr[RKISP1_PLANE_CB];
+ ispbuf->buff_addr[RKISP1_PLANE_CB] =
+ ispbuf->buff_addr[RKISP1_PLANE_CR] +
+ rkisp1_pixfmt_comp_size(pixm, RKISP1_PLANE_CR);
+ }
+
spin_lock_irqsave(&cap->buf.lock, flags);
/*
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] media: staging: rkisp1: cap: support uv swapped plane formats
2020-03-26 20:16 ` [PATCH 3/4] media: staging: rkisp1: cap: support uv swapped plane formats Dafna Hirschfeld
@ 2020-03-30 19:13 ` Helen Koike
0 siblings, 0 replies; 9+ messages in thread
From: Helen Koike @ 2020-03-30 19:13 UTC (permalink / raw)
To: Dafna Hirschfeld, linux-media, ezequiel, hverkuil, kernel,
dafna3, sakari.ailus, linux-rockchip, mchehab, laurent.pinchart
On 3/26/20 5:16 PM, Dafna Hirschfeld wrote:
> Plane formats with the u and v planes swapped can be
> supported by changing the address of the cb and cr in
> the buffer.
>
> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
> ---
> drivers/staging/media/rkisp1/rkisp1-capture.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
> index fa2849209433..2d274e8f565b 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-capture.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
> @@ -41,6 +41,10 @@
> (((write_format) == RKISP1_MI_CTRL_MP_WRITE_YUV_SPLA) || \
> ((write_format) == RKISP1_MI_CTRL_SP_WRITE_SPLA))
>
> +#define RKISP1_IS_PLANAR(write_format) \
> + (((write_format) == RKISP1_MI_CTRL_SP_WRITE_PLA) || \
> + ((write_format) == RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8))
> +
> enum rkisp1_plane {
> RKISP1_PLANE_Y = 0,
> RKISP1_PLANE_CB = 1,
> @@ -788,6 +792,19 @@ static void rkisp1_vb2_buf_queue(struct vb2_buffer *vb)
> rkisp1_pixfmt_comp_size(pixm, RKISP1_PLANE_CB);
> }
>
> + /*
> + * uv swap can be supported for plane formats by switching
> + * the address of cb and cr
> + */
> + if (RKISP1_IS_PLANAR(cap->pix.cfg->write_format) &&
> + cap->pix.cfg->uv_swap) {
> + ispbuf->buff_addr[RKISP1_PLANE_CR] =
> + ispbuf->buff_addr[RKISP1_PLANE_CB];
> + ispbuf->buff_addr[RKISP1_PLANE_CB] =
> + ispbuf->buff_addr[RKISP1_PLANE_CR] +
> + rkisp1_pixfmt_comp_size(pixm, RKISP1_PLANE_CR);
> + }
> +
> spin_lock_irqsave(&cap->buf.lock, flags);
>
> /*
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 4/4] media: staging: rkisp1: cap: remove unsupported formats
2020-03-26 20:16 [PATCH 0/4] media: staging: rkisp1: cap: various fixes for capture formats Dafna Hirschfeld
` (2 preceding siblings ...)
2020-03-26 20:16 ` [PATCH 3/4] media: staging: rkisp1: cap: support uv swapped plane formats Dafna Hirschfeld
@ 2020-03-26 20:16 ` Dafna Hirschfeld
2020-03-30 19:20 ` Helen Koike
3 siblings, 1 reply; 9+ messages in thread
From: Dafna Hirschfeld @ 2020-03-26 20:16 UTC (permalink / raw)
To: linux-media, dafna.hirschfeld, helen.koike, ezequiel, hverkuil,
kernel, dafna3, sakari.ailus, linux-rockchip, mchehab,
laurent.pinchart
For Ycbcr packed formats only YUYV can be supported by
the driver. This patch removes the other formats.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/staging/media/rkisp1/rkisp1-capture.c | 21 -------------------
1 file changed, 21 deletions(-)
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index 2d274e8f565b..076335193f40 100644
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -98,15 +98,6 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
.fmt_type = RKISP1_FMT_YUV,
.uv_swap = 0,
.write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
- }, {
- .fourcc = V4L2_PIX_FMT_YVYU,
- .fmt_type = RKISP1_FMT_YUV,
- .uv_swap = 1,
- .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
- }, {
- .fourcc = V4L2_PIX_FMT_VYUY,
- .fmt_type = RKISP1_FMT_YUV,
- .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
}, {
.fourcc = V4L2_PIX_FMT_YUV422P,
.fmt_type = RKISP1_FMT_YUV,
@@ -234,18 +225,6 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
.uv_swap = 0,
.write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
.output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
- }, {
- .fourcc = V4L2_PIX_FMT_YVYU,
- .fmt_type = RKISP1_FMT_YUV,
- .uv_swap = 1,
- .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
- .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
- }, {
- .fourcc = V4L2_PIX_FMT_VYUY,
- .fmt_type = RKISP1_FMT_YUV,
- .uv_swap = 1,
- .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
- .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
}, {
.fourcc = V4L2_PIX_FMT_YUV422P,
.fmt_type = RKISP1_FMT_YUV,
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 4/4] media: staging: rkisp1: cap: remove unsupported formats
2020-03-26 20:16 ` [PATCH 4/4] media: staging: rkisp1: cap: remove unsupported formats Dafna Hirschfeld
@ 2020-03-30 19:20 ` Helen Koike
0 siblings, 0 replies; 9+ messages in thread
From: Helen Koike @ 2020-03-30 19:20 UTC (permalink / raw)
To: Dafna Hirschfeld, linux-media, ezequiel, hverkuil, kernel,
dafna3, sakari.ailus, linux-rockchip, mchehab, laurent.pinchart
On 3/26/20 5:16 PM, Dafna Hirschfeld wrote:
> For Ycbcr packed formats only YUYV can be supported by
> the driver. This patch removes the other formats.
>
> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
> ---
> drivers/staging/media/rkisp1/rkisp1-capture.c | 21 -------------------
> 1 file changed, 21 deletions(-)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
> index 2d274e8f565b..076335193f40 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-capture.c
> +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
> @@ -98,15 +98,6 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
> .fmt_type = RKISP1_FMT_YUV,
> .uv_swap = 0,
> .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
> - }, {
> - .fourcc = V4L2_PIX_FMT_YVYU,
> - .fmt_type = RKISP1_FMT_YUV,
> - .uv_swap = 1,
> - .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
> - }, {
> - .fourcc = V4L2_PIX_FMT_VYUY,
> - .fmt_type = RKISP1_FMT_YUV,
> - .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
> }, {
> .fourcc = V4L2_PIX_FMT_YUV422P,
> .fmt_type = RKISP1_FMT_YUV,
> @@ -234,18 +225,6 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
> .uv_swap = 0,
> .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
> .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
> - }, {
> - .fourcc = V4L2_PIX_FMT_YVYU,
> - .fmt_type = RKISP1_FMT_YUV,
> - .uv_swap = 1,
> - .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
> - .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
> - }, {
> - .fourcc = V4L2_PIX_FMT_VYUY,
> - .fmt_type = RKISP1_FMT_YUV,
> - .uv_swap = 1,
> - .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
> - .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
> }, {
> .fourcc = V4L2_PIX_FMT_YUV422P,
> .fmt_type = RKISP1_FMT_YUV,
>
^ permalink raw reply [flat|nested] 9+ messages in thread