[5/7] media: renesas: vsp1: Add new formats (2-10-10-10 ARGB, Y210)
Commit Message
Add new pixel formats: XBGR2101010, ABGR2101010, BGRA1010102 and Y210.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
---
.../media/platform/renesas/vsp1/vsp1_pipe.c | 15 ++++++
.../media/platform/renesas/vsp1/vsp1_regs.h | 22 ++++++++
.../media/platform/renesas/vsp1/vsp1_rpf.c | 50 +++++++++++++++++++
3 files changed, 87 insertions(+)
Comments
Hi Tomi,
On Tue, Dec 6, 2022 at 2:44 PM Tomi Valkeinen
<tomi.valkeinen+renesas@ideasonboard.com> wrote:
> Add new pixel formats: XBGR2101010, ABGR2101010, BGRA1010102 and Y210.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
Thanks for your patch!
> --- a/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
> +++ b/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
> @@ -109,6 +109,56 @@ static void rpf_configure_stream(struct vsp1_entity *entity,
> vsp1_rpf_write(rpf, dlb, VI6_RPF_INFMT, infmt);
> vsp1_rpf_write(rpf, dlb, VI6_RPF_DSWAP, fmtinfo->swap);
>
> + if ((entity->vsp1->version & VI6_IP_VERSION_MODEL_MASK) == VI6_IP_VERSION_MODEL_VSPD_GEN4) {
> + u32 ext_infmt0;
> + u32 ext_infmt1;
> + u32 ext_infmt2;
> +
> + switch (fmtinfo->fourcc) {
> + case V4L2_PIX_FMT_XBGR2101010:
> + ext_infmt0 = VI6_RPF_EXT_INFMT0_BYPP_M1_RGB10;
> + ext_infmt1 = (0 << 24) | (10 << 16) |
> + (20 << 8) | (30 << 0);
Introducing PACK_CPOS(a, b, c, d)...
> + ext_infmt2 = (10 << 24) | (10 << 16) |
> + (10 << 8) | (0 << 0);
... and PACK_CLEN(a, b, c, d) macros (or a single PACK4() macro)
can make this less error-prone.
> + break;
> +
> + case V4L2_PIX_FMT_ABGR2101010:
> + ext_infmt0 = VI6_RPF_EXT_INFMT0_BYPP_M1_RGB10;
> + ext_infmt1 = (0 << 24) | (10 << 16) |
> + (20 << 8) | (30 << 0);
> + ext_infmt2 = (10 << 24) | (10 << 16) |
> + (10 << 8) | (2 << 0);
> + break;
> +
> + case V4L2_PIX_FMT_BGRA1010102:
> + ext_infmt0 = VI6_RPF_EXT_INFMT0_BYPP_M1_RGB10;
> + ext_infmt1 = (2 << 24) | (12 << 16) |
> + (22 << 8) | (22 << 0);
> + ext_infmt2 = (10 << 24) | (10 << 16) |
> + (10 << 8) | (2 << 0);
> + break;
> +
> + case V4L2_PIX_FMT_Y210:
> + ext_infmt0 = VI6_RPF_EXT_INFMT0_F2B_MSB |
> + VI6_RPF_EXT_INFMT0_IPBD_Y_10 |
> + VI6_RPF_EXT_INFMT0_IPBD_C_10;
> + ext_infmt1 = 0x0;
> + ext_infmt2 = 0x0;
> + break;
> +
> + default:
> + ext_infmt0 = 0;
> + ext_infmt1 = 0;
> + ext_infmt2 = 0;
> + break;
> + }
> +
> + vsp1_rpf_write(rpf, dlb, VI6_RPF_EXT_INFMT0, ext_infmt0);
> + vsp1_rpf_write(rpf, dlb, VI6_RPF_EXT_INFMT1, ext_infmt1);
> + vsp1_rpf_write(rpf, dlb, VI6_RPF_EXT_INFMT2, ext_infmt2);
> + }
> +
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On 06/12/2022 16:38, Geert Uytterhoeven wrote:
> Hi Tomi,
>
> On Tue, Dec 6, 2022 at 2:44 PM Tomi Valkeinen
> <tomi.valkeinen+renesas@ideasonboard.com> wrote:
>> Add new pixel formats: XBGR2101010, ABGR2101010, BGRA1010102 and Y210.
>>
>> Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
>
> Thanks for your patch!
>
>> --- a/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
>> +++ b/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
>> @@ -109,6 +109,56 @@ static void rpf_configure_stream(struct vsp1_entity *entity,
>> vsp1_rpf_write(rpf, dlb, VI6_RPF_INFMT, infmt);
>> vsp1_rpf_write(rpf, dlb, VI6_RPF_DSWAP, fmtinfo->swap);
>>
>> + if ((entity->vsp1->version & VI6_IP_VERSION_MODEL_MASK) == VI6_IP_VERSION_MODEL_VSPD_GEN4) {
>> + u32 ext_infmt0;
>> + u32 ext_infmt1;
>> + u32 ext_infmt2;
>> +
>> + switch (fmtinfo->fourcc) {
>> + case V4L2_PIX_FMT_XBGR2101010:
>> + ext_infmt0 = VI6_RPF_EXT_INFMT0_BYPP_M1_RGB10;
>> + ext_infmt1 = (0 << 24) | (10 << 16) |
>> + (20 << 8) | (30 << 0);
>
> Introducing PACK_CPOS(a, b, c, d)...
>
>> + ext_infmt2 = (10 << 24) | (10 << 16) |
>> + (10 << 8) | (0 << 0);
>
> ... and PACK_CLEN(a, b, c, d) macros (or a single PACK4() macro)
> can make this less error-prone.
Thanks. It does, and I found an error in V4L2_PIX_FMT_BGRA1010102 =).
Tomi
@@ -146,6 +146,18 @@ static const struct vsp1_format_info vsp1_video_formats[] = {
VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
1, { 32, 0, 0 }, false, false, 1, 1, false },
+ { V4L2_PIX_FMT_XBGR2101010, MEDIA_BUS_FMT_ARGB8888_1X32,
+ VI6_FMT_RGB10_RGB10A2_A2RGB10,
+ VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
+ 1, { 32, 0, 0 }, false, false, 1, 1, false },
+ { V4L2_PIX_FMT_ABGR2101010, MEDIA_BUS_FMT_ARGB8888_1X32,
+ VI6_FMT_RGB10_RGB10A2_A2RGB10,
+ VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
+ 1, { 32, 0, 0 }, false, false, 1, 1, false },
+ { V4L2_PIX_FMT_BGRA1010102, MEDIA_BUS_FMT_ARGB8888_1X32,
+ VI6_FMT_RGB10_RGB10A2_A2RGB10,
+ VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
+ 1, { 32, 0, 0 }, false, false, 1, 1, false },
{ V4L2_PIX_FMT_UYVY, MEDIA_BUS_FMT_AYUV8_1X32,
VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
@@ -202,6 +214,9 @@ static const struct vsp1_format_info vsp1_video_formats[] = {
VI6_FMT_Y_U_V_444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
3, { 8, 8, 8 }, false, true, 1, 1, false },
+ { V4L2_PIX_FMT_Y210, MEDIA_BUS_FMT_AYUV8_1X32,
+ VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
+ 1, { 32, 0, 0 }, false, false, 2, 1, false },
};
/**
@@ -228,6 +228,27 @@
#define VI6_RPF_MULT_ALPHA_RATIO_MASK (0xff << 0)
#define VI6_RPF_MULT_ALPHA_RATIO_SHIFT 0
+#define VI6_RPF_EXT_INFMT0 0x0370
+#define VI6_RPF_EXT_INFMT0_F2B_LSB (0 << 12)
+#define VI6_RPF_EXT_INFMT0_F2B_MSB (1 << 12)
+#define VI6_RPF_EXT_INFMT0_IPBD_Y_8 (0 << 8)
+#define VI6_RPF_EXT_INFMT0_IPBD_Y_10 (1 << 8)
+#define VI6_RPF_EXT_INFMT0_IPBD_Y_12 (2 << 8)
+#define VI6_RPF_EXT_INFMT0_IPBD_C_8 (0 << 4)
+#define VI6_RPF_EXT_INFMT0_IPBD_C_10 (1 << 4)
+#define VI6_RPF_EXT_INFMT0_IPBD_C_12 (2 << 4)
+#define VI6_RPF_EXT_INFMT0_BYPP_M1_RGB10 (3 << 0)
+#define VI6_RPF_EXT_INFMT0_BYPP_M1_N_RGB10 (0 << 0)
+
+#define VI6_RPF_EXT_INFMT1 0x0374
+#define VI6_RPF_EXT_INFMT2 0x0378
+
+#define VI6_RPF_BRDITH_CTRL 0x03e0
+#define VI6_RPF_BRDITH_CTRL_ODE_EN (1 << 8)
+#define VI6_RPF_BRDITH_CTRL_ODE_DIS (0 << 8)
+#define VI6_RPF_BRDITH_CTRL_CBRM_RO (1 << 0)
+#define VI6_RPF_BRDITH_CTRL_CBRM_TR (0 << 0)
+
/* -----------------------------------------------------------------------------
* WPF Control Registers
*/
@@ -846,6 +867,7 @@
#define VI6_FMT_XBXGXR_262626 0x21
#define VI6_FMT_ABGR_8888 0x22
#define VI6_FMT_XXRGB_88565 0x23
+#define VI6_FMT_RGB10_RGB10A2_A2RGB10 0x30
#define VI6_FMT_Y_UV_444 0x40
#define VI6_FMT_Y_UV_422 0x41
@@ -109,6 +109,56 @@ static void rpf_configure_stream(struct vsp1_entity *entity,
vsp1_rpf_write(rpf, dlb, VI6_RPF_INFMT, infmt);
vsp1_rpf_write(rpf, dlb, VI6_RPF_DSWAP, fmtinfo->swap);
+ if ((entity->vsp1->version & VI6_IP_VERSION_MODEL_MASK) == VI6_IP_VERSION_MODEL_VSPD_GEN4) {
+ u32 ext_infmt0;
+ u32 ext_infmt1;
+ u32 ext_infmt2;
+
+ switch (fmtinfo->fourcc) {
+ case V4L2_PIX_FMT_XBGR2101010:
+ ext_infmt0 = VI6_RPF_EXT_INFMT0_BYPP_M1_RGB10;
+ ext_infmt1 = (0 << 24) | (10 << 16) |
+ (20 << 8) | (30 << 0);
+ ext_infmt2 = (10 << 24) | (10 << 16) |
+ (10 << 8) | (0 << 0);
+ break;
+
+ case V4L2_PIX_FMT_ABGR2101010:
+ ext_infmt0 = VI6_RPF_EXT_INFMT0_BYPP_M1_RGB10;
+ ext_infmt1 = (0 << 24) | (10 << 16) |
+ (20 << 8) | (30 << 0);
+ ext_infmt2 = (10 << 24) | (10 << 16) |
+ (10 << 8) | (2 << 0);
+ break;
+
+ case V4L2_PIX_FMT_BGRA1010102:
+ ext_infmt0 = VI6_RPF_EXT_INFMT0_BYPP_M1_RGB10;
+ ext_infmt1 = (2 << 24) | (12 << 16) |
+ (22 << 8) | (22 << 0);
+ ext_infmt2 = (10 << 24) | (10 << 16) |
+ (10 << 8) | (2 << 0);
+ break;
+
+ case V4L2_PIX_FMT_Y210:
+ ext_infmt0 = VI6_RPF_EXT_INFMT0_F2B_MSB |
+ VI6_RPF_EXT_INFMT0_IPBD_Y_10 |
+ VI6_RPF_EXT_INFMT0_IPBD_C_10;
+ ext_infmt1 = 0x0;
+ ext_infmt2 = 0x0;
+ break;
+
+ default:
+ ext_infmt0 = 0;
+ ext_infmt1 = 0;
+ ext_infmt2 = 0;
+ break;
+ }
+
+ vsp1_rpf_write(rpf, dlb, VI6_RPF_EXT_INFMT0, ext_infmt0);
+ vsp1_rpf_write(rpf, dlb, VI6_RPF_EXT_INFMT1, ext_infmt1);
+ vsp1_rpf_write(rpf, dlb, VI6_RPF_EXT_INFMT2, ext_infmt2);
+ }
+
/* Output location. */
if (pipe->brx) {
const struct v4l2_rect *compose;