* [PATCH v3 0/6] drm: bridge: dw-hdmi: Add support for Custom PHYs
@ 2017-03-07 16:42 Neil Armstrong
2017-03-07 16:42 ` [PATCH v3 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function Neil Armstrong
` (5 more replies)
0 siblings, 6 replies; 24+ messages in thread
From: Neil Armstrong @ 2017-03-07 16:42 UTC (permalink / raw)
To: linus-amlogic
The Amlogic GX SoCs implements a Synopsys DesignWare HDMI TX Controller
in combination with a very custom PHY.
Thanks to Laurent Pinchart's changes, the HW report the following :
Detected HDMI TX controller v2.01a with HDCP (Vendor PHY)
The following differs from common PHY integration as managed in the current
driver :
- Amlogic PHY is not configured through the internal I2C link
- Amlogic PHY do not use the ENTMDS, SVSRET, PDDQ, ... signals from the controller
- Amlogic PHY do not export HPD ands RxSense signals to the controller
And finally, concerning the controller integration :
- the Controller registers are not flat memory-mapped, and uses an
addr+read/write register pair to write all registers.
- Inputs only YUV444 pixel data
Most of these uses case are implemented in Laurent Pinchart v5.1 patchset at [3] :
- Conversion to regmap for register access
- Add more callbacks ops to handle Custom PHYs
- Fixes a bug that considers the input to be always RBG and sends bad pixel
format to a DVI sink by disabling CSC
This is why the following patchset implements :
- Configure the Input format from the plat_data
- Add PHY callback to handle HPD and RxSense out of the dw-hdmi driver
To implement the input format handling, the Synopsys HDMIT TX Controller input
V4L bus formats are used and missing formats + documentation are added.
This patchset makes the Amlogic GX SoCs HDMI output successfully work, and is
also tested on the RK3288 ACT8846 EVB Board.
Changes since v2 at [4] :
- Rebase on laurent patch "Extract PHY interrupt setup to a function"
- Reduce phy operations
- Switch the V4L bus formats and encodings instead of custom enum
Changes since v1 at [2] :
- Drop patches submitted by laurent
Changes since RFC at [1] :
- Regmap fixup for 4bytes register access, tested on RK3288 SoC
- Move phy callbacks to phy_ops and move Synopsys PHY calls into default ops
- Move HDMI link data into shared header
- Move Pixel Encoding enum to shared header
[1] http://lkml.kernel.org/r/1484656294-6140-1-git-send-email-narmstrong at baylibre.com
[2] http://lkml.kernel.org/r/1485774318-21916-1-git-send-email-narmstrong at baylibre.com
[3] http://lkml.kernel.org/r/20170303172007.26541-1-laurent.pinchart+renesas at ideasonboard.com
[4] http://lkml.kernel.org/r/1488468572-31971-1-git-send-email-narmstrong at baylibre.com
Laurent Pinchart (1):
drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function
Neil Armstrong (5):
media: uapi: Add RGB and YUV bus formats for Synopsys HDMI TX
Controller
documentation: media: Add documentation for new RGB and YUV bus
formats
drm: bridge: dw-hdmi: Switch to V4L bus format and encodings
drm: bridge: dw-hdmi: Add Documentation on supported input formats
drm: bridge: dw-hdmi: Move HPD handling to PHY operations
Documentation/gpu/dw-hdmi.rst | 15 +
Documentation/gpu/index.rst | 1 +
Documentation/media/uapi/v4l/subdev-formats.rst | 4992 ++++++++++++++++++-----
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 465 ++-
include/drm/bridge/dw_hdmi.h | 68 +
include/uapi/linux/media-bus-format.h | 13 +-
6 files changed, 4368 insertions(+), 1186 deletions(-)
create mode 100644 Documentation/gpu/dw-hdmi.rst
--
1.9.1
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH v3 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function 2017-03-07 16:42 [PATCH v3 0/6] drm: bridge: dw-hdmi: Add support for Custom PHYs Neil Armstrong @ 2017-03-07 16:42 ` Neil Armstrong 2017-03-07 17:12 ` Jose Abreu 2017-03-07 16:42 ` [PATCH v3 2/6] media: uapi: Add RGB and YUV bus formats for Synopsys HDMI TX Controller Neil Armstrong ` (4 subsequent siblings) 5 siblings, 1 reply; 24+ messages in thread From: Neil Armstrong @ 2017-03-07 16:42 UTC (permalink / raw) To: linus-amlogic From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> In preparation for adding PHY operations to handle RX SENSE and HPD, group all the PHY interrupt setup code in a single location and extract it to a separate function. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 50 ++++++++++++++----------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 026a0dc..1ed8bc1 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1496,7 +1496,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) } /* Wait until we are registered to enable interrupts */ -static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) +static void dw_hdmi_fb_registered(struct dw_hdmi *hdmi) { hdmi_writeb(hdmi, HDMI_PHY_I2CM_INT_ADDR_DONE_POL, HDMI_PHY_I2CM_INT_ADDR); @@ -1504,15 +1504,6 @@ static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL, HDMI_PHY_I2CM_CTLINT_ADDR); - - /* enable cable hot plug irq */ - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); - - /* Clear Hotplug interrupts */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - - return 0; } static void initialize_hdmi_ih_mutes(struct dw_hdmi *hdmi) @@ -1630,6 +1621,26 @@ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); } +static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi) +{ + /* + * Configure the PHY RX SENSE and HPD interrupts polarities and clear + * any pending interrupt. + */ + hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + + /* Enable cable hot plug irq. */ + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); + + /* Clear and unmute interrupts. */ + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), + HDMI_IH_MUTE_PHY_STAT0); +} + static enum drm_connector_status dw_hdmi_connector_detect(struct drm_connector *connector, bool force) { @@ -2141,29 +2152,14 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) hdmi->ddc = NULL; } - /* - * Configure registers related to HDMI interrupt - * generation before registering IRQ. - */ - hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); - - /* Clear Hotplug interrupts */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - hdmi->bridge.driver_private = hdmi; hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; #ifdef CONFIG_OF hdmi->bridge.of_node = pdev->dev.of_node; #endif - ret = dw_hdmi_fb_registered(hdmi); - if (ret) - goto err_iahb; - - /* Unmute interrupts */ - hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), - HDMI_IH_MUTE_PHY_STAT0); + dw_hdmi_fb_registered(hdmi); + dw_hdmi_phy_setup_hpd(hdmi); memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo.parent = dev; -- 1.9.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v3 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function 2017-03-07 16:42 ` [PATCH v3 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function Neil Armstrong @ 2017-03-07 17:12 ` Jose Abreu 2017-03-08 10:25 ` Neil Armstrong 0 siblings, 1 reply; 24+ messages in thread From: Jose Abreu @ 2017-03-07 17:12 UTC (permalink / raw) To: linus-amlogic Hi Neil, On 07-03-2017 16:42, Neil Armstrong wrote: > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > In preparation for adding PHY operations to handle RX SENSE and HPD, > group all the PHY interrupt setup code in a single location and extract > it to a separate function. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 50 ++++++++++++++----------------- > 1 file changed, 23 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > index 026a0dc..1ed8bc1 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > @@ -1496,7 +1496,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) > } > > /* Wait until we are registered to enable interrupts */ > -static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) > +static void dw_hdmi_fb_registered(struct dw_hdmi *hdmi) > { > hdmi_writeb(hdmi, HDMI_PHY_I2CM_INT_ADDR_DONE_POL, > HDMI_PHY_I2CM_INT_ADDR); > @@ -1504,15 +1504,6 @@ static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) > hdmi_writeb(hdmi, HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | > HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL, > HDMI_PHY_I2CM_CTLINT_ADDR); > - > - /* enable cable hot plug irq */ > - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); > - > - /* Clear Hotplug interrupts */ > - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, > - HDMI_IH_PHY_STAT0); > - > - return 0; > } > > static void initialize_hdmi_ih_mutes(struct dw_hdmi *hdmi) > @@ -1630,6 +1621,26 @@ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) > hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); > } > > +static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi) > +{ > + /* > + * Configure the PHY RX SENSE and HPD interrupts polarities and clear > + * any pending interrupt. > + */ > + hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); > + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, > + HDMI_IH_PHY_STAT0); > + > + /* Enable cable hot plug irq. */ > + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); > + > + /* Clear and unmute interrupts. */ > + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, > + HDMI_IH_PHY_STAT0); > + hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), > + HDMI_IH_MUTE_PHY_STAT0); > +} > + > static enum drm_connector_status > dw_hdmi_connector_detect(struct drm_connector *connector, bool force) > { > @@ -2141,29 +2152,14 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) > hdmi->ddc = NULL; > } > > - /* > - * Configure registers related to HDMI interrupt > - * generation before registering IRQ. > - */ I've seen the databook and HPD interrupts are enabled per default (actually I think most of the interrupts are). I'm thinking whether we could get spurious interrupts because of not configuring HPD before registering IRQ (probably thats why the comment was there). How did you test this? I think that if you insert the cable before loading modules then you can try to emulate this condition. What do you think? Best regards, Jose Miguel Abreu > - hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); > - > - /* Clear Hotplug interrupts */ > - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, > - HDMI_IH_PHY_STAT0); > - > hdmi->bridge.driver_private = hdmi; > hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; > #ifdef CONFIG_OF > hdmi->bridge.of_node = pdev->dev.of_node; > #endif > > - ret = dw_hdmi_fb_registered(hdmi); > - if (ret) > - goto err_iahb; > - > - /* Unmute interrupts */ > - hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), > - HDMI_IH_MUTE_PHY_STAT0); > + dw_hdmi_fb_registered(hdmi); > + dw_hdmi_phy_setup_hpd(hdmi); > > memset(&pdevinfo, 0, sizeof(pdevinfo)); > pdevinfo.parent = dev; ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function 2017-03-07 17:12 ` Jose Abreu @ 2017-03-08 10:25 ` Neil Armstrong 0 siblings, 0 replies; 24+ messages in thread From: Neil Armstrong @ 2017-03-08 10:25 UTC (permalink / raw) To: linus-amlogic Hi Jose, On 03/07/2017 06:12 PM, Jose Abreu wrote: > Hi Neil, > > > On 07-03-2017 16:42, Neil Armstrong wrote: >> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> >> >> In preparation for adding PHY operations to handle RX SENSE and HPD, >> group all the PHY interrupt setup code in a single location and extract >> it to a separate function. >> >> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 50 ++++++++++++++----------------- >> 1 file changed, 23 insertions(+), 27 deletions(-) >> >> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c >> index 026a0dc..1ed8bc1 100644 >> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c >> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c >> @@ -1496,7 +1496,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) >> } >> >> /* Wait until we are registered to enable interrupts */ >> -static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) >> +static void dw_hdmi_fb_registered(struct dw_hdmi *hdmi) >> { >> hdmi_writeb(hdmi, HDMI_PHY_I2CM_INT_ADDR_DONE_POL, >> HDMI_PHY_I2CM_INT_ADDR); >> @@ -1504,15 +1504,6 @@ static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) >> hdmi_writeb(hdmi, HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | >> HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL, >> HDMI_PHY_I2CM_CTLINT_ADDR); >> - >> - /* enable cable hot plug irq */ >> - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); >> - >> - /* Clear Hotplug interrupts */ >> - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, >> - HDMI_IH_PHY_STAT0); >> - >> - return 0; >> } >> >> static void initialize_hdmi_ih_mutes(struct dw_hdmi *hdmi) >> @@ -1630,6 +1621,26 @@ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) >> hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); >> } >> >> +static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi) >> +{ >> + /* >> + * Configure the PHY RX SENSE and HPD interrupts polarities and clear >> + * any pending interrupt. >> + */ >> + hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); >> + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, >> + HDMI_IH_PHY_STAT0); >> + >> + /* Enable cable hot plug irq. */ >> + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); >> + >> + /* Clear and unmute interrupts. */ >> + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, >> + HDMI_IH_PHY_STAT0); >> + hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), >> + HDMI_IH_MUTE_PHY_STAT0); >> +} >> + >> static enum drm_connector_status >> dw_hdmi_connector_detect(struct drm_connector *connector, bool force) >> { >> @@ -2141,29 +2152,14 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) >> hdmi->ddc = NULL; >> } >> >> - /* >> - * Configure registers related to HDMI interrupt >> - * generation before registering IRQ. >> - */ > > > I've seen the databook and HPD interrupts are enabled per default > (actually I think most of the interrupts are). I'm thinking > whether we could get spurious interrupts because of not > configuring HPD before registering IRQ (probably thats why the > comment was there). How did you test this? I think that if you > insert the cable before loading modules then you can try to > emulate this condition. What do you think? In fact the comment was wrong because it happened after the IRQ register, and right before the IRQ register the initialize_hdmi_ih_mutes() is already called to mute all the IRQ sources. The previous rework moved the IRQ code, so this cleanup is welcome. But indeed, I did not check this condition, I can try this. Thanks, Neil > > Best regards, > Jose Miguel Abreu > >> - hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); >> - >> - /* Clear Hotplug interrupts */ >> - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, >> - HDMI_IH_PHY_STAT0); >> - >> hdmi->bridge.driver_private = hdmi; >> hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; >> #ifdef CONFIG_OF >> hdmi->bridge.of_node = pdev->dev.of_node; >> #endif >> >> - ret = dw_hdmi_fb_registered(hdmi); >> - if (ret) >> - goto err_iahb; >> - >> - /* Unmute interrupts */ >> - hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), >> - HDMI_IH_MUTE_PHY_STAT0); >> + dw_hdmi_fb_registered(hdmi); >> + dw_hdmi_phy_setup_hpd(hdmi); >> >> memset(&pdevinfo, 0, sizeof(pdevinfo)); >> pdevinfo.parent = dev; ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 2/6] media: uapi: Add RGB and YUV bus formats for Synopsys HDMI TX Controller 2017-03-07 16:42 [PATCH v3 0/6] drm: bridge: dw-hdmi: Add support for Custom PHYs Neil Armstrong 2017-03-07 16:42 ` [PATCH v3 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function Neil Armstrong @ 2017-03-07 16:42 ` Neil Armstrong 2017-03-16 17:06 ` Archit Taneja 2017-03-20 15:35 ` Hans Verkuil 2017-03-07 16:42 ` [PATCH v3 3/6] documentation: media: Add documentation for new RGB and YUV bus formats Neil Armstrong ` (3 subsequent siblings) 5 siblings, 2 replies; 24+ messages in thread From: Neil Armstrong @ 2017-03-07 16:42 UTC (permalink / raw) To: linus-amlogic In order to describe the RGB and YUB bus formats used to feed the Synopsys DesignWare HDMI TX Controller, add missing formats to the list of Bus Formats. Documentation for these formats is added in a separate patch. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- include/uapi/linux/media-bus-format.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h index 2168759..7cc820b 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -33,7 +33,7 @@ #define MEDIA_BUS_FMT_FIXED 0x0001 -/* RGB - next is 0x1018 */ +/* RGB - next is 0x101b */ #define MEDIA_BUS_FMT_RGB444_1X12 0x1016 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 @@ -57,8 +57,11 @@ #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f +#define MEDIA_BUS_FMT_RGB101010_1X30 0x1018 +#define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 +#define MEDIA_BUS_FMT_RGB161616_1X48 0x101a -/* YUV (including grey) - next is 0x2026 */ +/* YUV (including grey) - next is 0x202c */ #define MEDIA_BUS_FMT_Y8_1X8 0x2001 #define MEDIA_BUS_FMT_UV8_1X8 0x2015 #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 @@ -90,12 +93,18 @@ #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e #define MEDIA_BUS_FMT_VUY8_1X24 0x2024 #define MEDIA_BUS_FMT_YUV8_1X24 0x2025 +#define MEDIA_BUS_FMT_UYVY8_1_1X24 0x2026 #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020 #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021 #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022 #define MEDIA_BUS_FMT_YVYU12_1X24 0x2023 #define MEDIA_BUS_FMT_YUV10_1X30 0x2016 +#define MEDIA_BUS_FMT_UYVY10_1_1X30 0x2027 #define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 +#define MEDIA_BUS_FMT_UYVY12_1_1X36 0x2028 +#define MEDIA_BUS_FMT_YUV12_1X36 0x2029 +#define MEDIA_BUS_FMT_YUV16_1X48 0x202a +#define MEDIA_BUS_FMT_UYVY16_1_1X48 0x202b /* Bayer - next is 0x3021 */ #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001 -- 1.9.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v3 2/6] media: uapi: Add RGB and YUV bus formats for Synopsys HDMI TX Controller 2017-03-07 16:42 ` [PATCH v3 2/6] media: uapi: Add RGB and YUV bus formats for Synopsys HDMI TX Controller Neil Armstrong @ 2017-03-16 17:06 ` Archit Taneja 2017-03-17 16:10 ` Neil Armstrong 2017-03-20 15:35 ` Hans Verkuil 1 sibling, 1 reply; 24+ messages in thread From: Archit Taneja @ 2017-03-16 17:06 UTC (permalink / raw) To: linus-amlogic On 3/7/2017 10:12 PM, Neil Armstrong wrote: > In order to describe the RGB and YUB bus formats used to feed the s/YUB/YUV > Synopsys DesignWare HDMI TX Controller, add missing formats to the > list of Bus Formats. > > Documentation for these formats is added in a separate patch. > Reviewed-by: Archit Taneja <architt@codeaurora.org> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > include/uapi/linux/media-bus-format.h | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h > index 2168759..7cc820b 100644 > --- a/include/uapi/linux/media-bus-format.h > +++ b/include/uapi/linux/media-bus-format.h > @@ -33,7 +33,7 @@ > > #define MEDIA_BUS_FMT_FIXED 0x0001 > > -/* RGB - next is 0x1018 */ > +/* RGB - next is 0x101b */ > #define MEDIA_BUS_FMT_RGB444_1X12 0x1016 > #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 > #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 > @@ -57,8 +57,11 @@ > #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 > #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d > #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f > +#define MEDIA_BUS_FMT_RGB101010_1X30 0x1018 > +#define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 > +#define MEDIA_BUS_FMT_RGB161616_1X48 0x101a > > -/* YUV (including grey) - next is 0x2026 */ > +/* YUV (including grey) - next is 0x202c */ > #define MEDIA_BUS_FMT_Y8_1X8 0x2001 > #define MEDIA_BUS_FMT_UV8_1X8 0x2015 > #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 > @@ -90,12 +93,18 @@ > #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e > #define MEDIA_BUS_FMT_VUY8_1X24 0x2024 > #define MEDIA_BUS_FMT_YUV8_1X24 0x2025 > +#define MEDIA_BUS_FMT_UYVY8_1_1X24 0x2026 > #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020 > #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021 > #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022 > #define MEDIA_BUS_FMT_YVYU12_1X24 0x2023 > #define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > +#define MEDIA_BUS_FMT_UYVY10_1_1X30 0x2027 > #define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 > +#define MEDIA_BUS_FMT_UYVY12_1_1X36 0x2028 > +#define MEDIA_BUS_FMT_YUV12_1X36 0x2029 > +#define MEDIA_BUS_FMT_YUV16_1X48 0x202a > +#define MEDIA_BUS_FMT_UYVY16_1_1X48 0x202b > > /* Bayer - next is 0x3021 */ > #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001 > -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 2/6] media: uapi: Add RGB and YUV bus formats for Synopsys HDMI TX Controller 2017-03-16 17:06 ` Archit Taneja @ 2017-03-17 16:10 ` Neil Armstrong 0 siblings, 0 replies; 24+ messages in thread From: Neil Armstrong @ 2017-03-17 16:10 UTC (permalink / raw) To: linus-amlogic On 03/16/2017 06:06 PM, Archit Taneja wrote: > > > On 3/7/2017 10:12 PM, Neil Armstrong wrote: >> In order to describe the RGB and YUB bus formats used to feed the > > s/YUB/YUV Thanks for pointing me this ! Neil > >> Synopsys DesignWare HDMI TX Controller, add missing formats to the >> list of Bus Formats. >> >> Documentation for these formats is added in a separate patch. >> > > Reviewed-by: Archit Taneja <architt@codeaurora.org> > >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> include/uapi/linux/media-bus-format.h | 13 +++++++++++-- >> 1 file changed, 11 insertions(+), 2 deletions(-) >> >> diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h >> index 2168759..7cc820b 100644 >> --- a/include/uapi/linux/media-bus-format.h >> +++ b/include/uapi/linux/media-bus-format.h >> @@ -33,7 +33,7 @@ >> >> #define MEDIA_BUS_FMT_FIXED 0x0001 >> >> -/* RGB - next is 0x1018 */ >> +/* RGB - next is 0x101b */ >> #define MEDIA_BUS_FMT_RGB444_1X12 0x1016 >> #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 >> #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 >> @@ -57,8 +57,11 @@ >> #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 >> #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d >> #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f >> +#define MEDIA_BUS_FMT_RGB101010_1X30 0x1018 >> +#define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 >> +#define MEDIA_BUS_FMT_RGB161616_1X48 0x101a >> >> -/* YUV (including grey) - next is 0x2026 */ >> +/* YUV (including grey) - next is 0x202c */ >> #define MEDIA_BUS_FMT_Y8_1X8 0x2001 >> #define MEDIA_BUS_FMT_UV8_1X8 0x2015 >> #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 >> @@ -90,12 +93,18 @@ >> #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e >> #define MEDIA_BUS_FMT_VUY8_1X24 0x2024 >> #define MEDIA_BUS_FMT_YUV8_1X24 0x2025 >> +#define MEDIA_BUS_FMT_UYVY8_1_1X24 0x2026 >> #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020 >> #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021 >> #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022 >> #define MEDIA_BUS_FMT_YVYU12_1X24 0x2023 >> #define MEDIA_BUS_FMT_YUV10_1X30 0x2016 >> +#define MEDIA_BUS_FMT_UYVY10_1_1X30 0x2027 >> #define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 >> +#define MEDIA_BUS_FMT_UYVY12_1_1X36 0x2028 >> +#define MEDIA_BUS_FMT_YUV12_1X36 0x2029 >> +#define MEDIA_BUS_FMT_YUV16_1X48 0x202a >> +#define MEDIA_BUS_FMT_UYVY16_1_1X48 0x202b >> >> /* Bayer - next is 0x3021 */ >> #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001 >> > ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 2/6] media: uapi: Add RGB and YUV bus formats for Synopsys HDMI TX Controller 2017-03-07 16:42 ` [PATCH v3 2/6] media: uapi: Add RGB and YUV bus formats for Synopsys HDMI TX Controller Neil Armstrong 2017-03-16 17:06 ` Archit Taneja @ 2017-03-20 15:35 ` Hans Verkuil 1 sibling, 0 replies; 24+ messages in thread From: Hans Verkuil @ 2017-03-20 15:35 UTC (permalink / raw) To: linus-amlogic On 03/07/2017 05:42 PM, Neil Armstrong wrote: > In order to describe the RGB and YUB bus formats used to feed the > Synopsys DesignWare HDMI TX Controller, add missing formats to the > list of Bus Formats. > > Documentation for these formats is added in a separate patch. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > include/uapi/linux/media-bus-format.h | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h > index 2168759..7cc820b 100644 > --- a/include/uapi/linux/media-bus-format.h > +++ b/include/uapi/linux/media-bus-format.h > @@ -33,7 +33,7 @@ > > #define MEDIA_BUS_FMT_FIXED 0x0001 > > -/* RGB - next is 0x1018 */ > +/* RGB - next is 0x101b */ > #define MEDIA_BUS_FMT_RGB444_1X12 0x1016 > #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 > #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 > @@ -57,8 +57,11 @@ > #define MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA 0x1012 > #define MEDIA_BUS_FMT_ARGB8888_1X32 0x100d > #define MEDIA_BUS_FMT_RGB888_1X32_PADHI 0x100f > +#define MEDIA_BUS_FMT_RGB101010_1X30 0x1018 > +#define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 > +#define MEDIA_BUS_FMT_RGB161616_1X48 0x101a > > -/* YUV (including grey) - next is 0x2026 */ > +/* YUV (including grey) - next is 0x202c */ > #define MEDIA_BUS_FMT_Y8_1X8 0x2001 > #define MEDIA_BUS_FMT_UV8_1X8 0x2015 > #define MEDIA_BUS_FMT_UYVY8_1_5X8 0x2002 > @@ -90,12 +93,18 @@ > #define MEDIA_BUS_FMT_YVYU10_1X20 0x200e > #define MEDIA_BUS_FMT_VUY8_1X24 0x2024 > #define MEDIA_BUS_FMT_YUV8_1X24 0x2025 > +#define MEDIA_BUS_FMT_UYVY8_1_1X24 0x2026 > #define MEDIA_BUS_FMT_UYVY12_1X24 0x2020 > #define MEDIA_BUS_FMT_VYUY12_1X24 0x2021 > #define MEDIA_BUS_FMT_YUYV12_1X24 0x2022 > #define MEDIA_BUS_FMT_YVYU12_1X24 0x2023 > #define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > +#define MEDIA_BUS_FMT_UYVY10_1_1X30 0x2027 > #define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 > +#define MEDIA_BUS_FMT_UYVY12_1_1X36 0x2028 > +#define MEDIA_BUS_FMT_YUV12_1X36 0x2029 > +#define MEDIA_BUS_FMT_YUV16_1X48 0x202a > +#define MEDIA_BUS_FMT_UYVY16_1_1X48 0x202b > > /* Bayer - next is 0x3021 */ > #define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001 > These new bus formats: #define MEDIA_BUS_FMT_UYVY8_1_1X24 0x2026 #define MEDIA_BUS_FMT_UYVY10_1_1X30 0x2027 #define MEDIA_BUS_FMT_UYVY12_1_1X36 0x2028 #define MEDIA_BUS_FMT_UYVY16_1_1X48 0x202b are all 4:2:0, right? I think these should all be renamed to: #define MEDIA_BUS_FMT_UYYVYY8_1X24 0x2026 #define MEDIA_BUS_FMT_UYYVYY10_1X30 0x2027 #define MEDIA_BUS_FMT_UYYVYY12_1X36 0x2028 #define MEDIA_BUS_FMT_UYYVYY16_1X48 0x202b Conform the other 4:2:0 format MEDIA_BUS_FMT_YDYUYDYV8_1X16 (except without the 'D'!). I am slightly unsure about the _1. Strictly speaking we're transferring two pixels per bus-sample, so _0_5 might be more accurate. Sakari, what's your opinion about that? Regards, Hans ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 3/6] documentation: media: Add documentation for new RGB and YUV bus formats 2017-03-07 16:42 [PATCH v3 0/6] drm: bridge: dw-hdmi: Add support for Custom PHYs Neil Armstrong 2017-03-07 16:42 ` [PATCH v3 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function Neil Armstrong 2017-03-07 16:42 ` [PATCH v3 2/6] media: uapi: Add RGB and YUV bus formats for Synopsys HDMI TX Controller Neil Armstrong @ 2017-03-07 16:42 ` Neil Armstrong 2017-03-16 17:01 ` Archit Taneja 2017-03-20 14:33 ` Hans Verkuil 2017-03-07 16:42 ` [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings Neil Armstrong ` (2 subsequent siblings) 5 siblings, 2 replies; 24+ messages in thread From: Neil Armstrong @ 2017-03-07 16:42 UTC (permalink / raw) To: linus-amlogic Add documentation for added Bus Formats to describe RGB and YUS formats used as input to the Synopsys DesignWare HDMI TX Controller. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- Documentation/media/uapi/v4l/subdev-formats.rst | 4992 ++++++++++++++++++----- 1 file changed, 3963 insertions(+), 1029 deletions(-) diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst index d6152c9..feb55b5 100644 --- a/Documentation/media/uapi/v4l/subdev-formats.rst +++ b/Documentation/media/uapi/v4l/subdev-formats.rst @@ -114,7 +114,7 @@ The following tables list existing packed RGB formats. .. it switches to long table, and there's no way to override it. -.. tabularcolumns:: |p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}| +.. tabularcolumns:: |p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}| .. _v4l2-mbus-pixelcode-rgb: @@ -127,7 +127,7 @@ The following tables list existing packed RGB formats. .. flat-table:: RGB formats :header-rows: 2 :stub-columns: 0 - :widths: 36 7 3 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 + :widths: 36 7 3 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 * - Identifier - Code @@ -136,6 +136,22 @@ The following tables list existing packed RGB formats. * - - - Bit + - 47 + - 46 + - 45 + - 44 + - 43 + - 42 + - 41 + - 40 + - 39 + - 38 + - 37 + - 36 + - 35 + - 34 + - 33 + - 32 - 31 - 30 - 29 @@ -193,6 +209,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - r\ :sub:`3` - r\ :sub:`2` - r\ :sub:`1` @@ -234,6 +266,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - 0 - 0 - 0 @@ -269,6 +317,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`3` - g\ :sub:`2` - g\ :sub:`1` @@ -306,6 +370,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`3` - g\ :sub:`2` - g\ :sub:`1` @@ -341,6 +421,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - 0 - 0 - 0 @@ -378,6 +474,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - 0 - r\ :sub:`4` - r\ :sub:`3` @@ -413,6 +525,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`2` - g\ :sub:`1` - g\ :sub:`0` @@ -450,6 +578,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`2` - g\ :sub:`1` - g\ :sub:`0` @@ -485,6 +629,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - 0 - r\ :sub:`4` - r\ :sub:`3` @@ -514,6 +674,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - r\ :sub:`4` - r\ :sub:`3` - r\ :sub:`2` @@ -559,6 +735,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - b\ :sub:`4` - b\ :sub:`3` - b\ :sub:`2` @@ -594,6 +786,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`2` - g\ :sub:`1` - g\ :sub:`0` @@ -631,6 +839,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`2` - g\ :sub:`1` - g\ :sub:`0` @@ -666,6 +890,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - b\ :sub:`4` - b\ :sub:`3` - b\ :sub:`2` @@ -703,6 +943,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - r\ :sub:`4` - r\ :sub:`3` - r\ :sub:`2` @@ -738,6 +994,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`2` - g\ :sub:`1` - g\ :sub:`0` @@ -775,6 +1047,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`2` - g\ :sub:`1` - g\ :sub:`0` @@ -810,6 +1098,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - r\ :sub:`4` - r\ :sub:`3` - r\ :sub:`2` @@ -837,6 +1141,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - r\ :sub:`5` - r\ :sub:`4` - r\ :sub:`3` @@ -868,6 +1188,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - r\ :sub:`7` - r\ :sub:`6` - r\ :sub:`5` @@ -905,6 +1241,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - 0 - 0 - r\ :sub:`5` @@ -942,6 +1294,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - b\ :sub:`7` - b\ :sub:`6` - b\ :sub:`5` @@ -979,6 +1347,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`7` - g\ :sub:`6` - g\ :sub:`5` @@ -1016,6 +1400,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - r\ :sub:`7` - r\ :sub:`6` - r\ :sub:`5` @@ -1065,6 +1465,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - r\ :sub:`7` - r\ :sub:`6` - r\ :sub:`5` @@ -1100,6 +1516,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`3` - g\ :sub:`2` - g\ :sub:`1` @@ -1137,6 +1569,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - g\ :sub:`3` - g\ :sub:`2` - g\ :sub:`1` @@ -1172,6 +1620,22 @@ The following tables list existing packed RGB formats. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - r\ :sub:`7` - r\ :sub:`6` - r\ :sub:`5` @@ -1189,6 +1653,22 @@ The following tables list existing packed RGB formats. - MEDIA_BUS_FMT_ARGB888_1X32 - 0x100d - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - a\ :sub:`7` - a\ :sub:`6` - a\ :sub:`5` @@ -1226,6 +1706,22 @@ The following tables list existing packed RGB formats. - MEDIA_BUS_FMT_RGB888_1X32_PADHI - 0x100f - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - 0 - 0 - 0 @@ -1258,42 +1754,201 @@ The following tables list existing packed RGB formats. - b\ :sub:`2` - b\ :sub:`1` - b\ :sub:`0` + * .. _MEDIA-BUS-FMT-RGB101010-1X30: -.. raw:: latex - - \endgroup - -On LVDS buses, usually each sample is transferred serialized in seven -time slots per pixel clock, on three (18-bit) or four (24-bit) -differential data pairs at the same time. The remaining bits are used -for control signals as defined by SPWG/PSWG/VESA or JEIDA standards. The -24-bit RGB format serialized in seven time slots on four lanes using -JEIDA defined bit mapping will be named -``MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA``, for example. - -.. raw:: latex - - \begin{adjustbox}{width=\columnwidth} - -.. _v4l2-mbus-pixelcode-rgb-lvds: - -.. flat-table:: LVDS RGB formats - :header-rows: 2 - :stub-columns: 0 - - * - Identifier - - Code + - MEDIA_BUS_FMT_RGB101010_1X30 + - 0x1018 - - - - :cspan:`3` Data organization - * - - - - Timeslot - - Lane - - 3 - - 2 - - 1 - - 0 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - 0 + - 0 + - r\ :sub:`9` + - r\ :sub:`8` + - r\ :sub:`7` + - r\ :sub:`6` + - r\ :sub:`5` + - r\ :sub:`4` + - r\ :sub:`3` + - r\ :sub:`2` + - r\ :sub:`1` + - r\ :sub:`0` + - g\ :sub:`9` + - g\ :sub:`8` + - g\ :sub:`7` + - g\ :sub:`6` + - g\ :sub:`5` + - g\ :sub:`4` + - g\ :sub:`3` + - g\ :sub:`2` + - g\ :sub:`1` + - g\ :sub:`0` + - b\ :sub:`9` + - b\ :sub:`8` + - b\ :sub:`7` + - b\ :sub:`6` + - b\ :sub:`5` + - b\ :sub:`4` + - b\ :sub:`3` + - b\ :sub:`2` + - b\ :sub:`1` + - b\ :sub:`0` + * .. _MEDIA-BUS-FMT-RGB121212-1X36: + + - MEDIA_BUS_FMT_RGB121212_1X36 + - 0x1019 + - + - + - + - + - + - + - + - + - + - + - + - + - + - r\ :sub:`11` + - r\ :sub:`10` + - r\ :sub:`9` + - r\ :sub:`8` + - r\ :sub:`7` + - r\ :sub:`6` + - r\ :sub:`5` + - r\ :sub:`4` + - r\ :sub:`3` + - r\ :sub:`2` + - r\ :sub:`1` + - r\ :sub:`0` + - g\ :sub:`11` + - g\ :sub:`10` + - g\ :sub:`9` + - g\ :sub:`8` + - g\ :sub:`7` + - g\ :sub:`6` + - g\ :sub:`5` + - g\ :sub:`4` + - g\ :sub:`3` + - g\ :sub:`2` + - g\ :sub:`1` + - g\ :sub:`0` + - b\ :sub:`11` + - b\ :sub:`10` + - b\ :sub:`9` + - b\ :sub:`8` + - b\ :sub:`7` + - b\ :sub:`6` + - b\ :sub:`5` + - b\ :sub:`4` + - b\ :sub:`3` + - b\ :sub:`2` + - b\ :sub:`1` + - b\ :sub:`0` + * .. _MEDIA-BUS-FMT-RGB161616-1X48: + + - MEDIA_BUS_FMT_RGB161616_1X48 + - 0x10 + - + - r\ :sub:`15` + - r\ :sub:`14` + - r\ :sub:`13` + - r\ :sub:`12` + - r\ :sub:`11` + - r\ :sub:`10` + - r\ :sub:`9` + - r\ :sub:`8` + - r\ :sub:`7` + - r\ :sub:`6` + - r\ :sub:`5` + - r\ :sub:`4` + - r\ :sub:`3` + - r\ :sub:`2` + - r\ :sub:`1` + - r\ :sub:`0` + - g\ :sub:`15` + - g\ :sub:`14` + - g\ :sub:`13` + - g\ :sub:`12` + - g\ :sub:`11` + - g\ :sub:`10` + - g\ :sub:`9` + - g\ :sub:`8` + - g\ :sub:`7` + - g\ :sub:`6` + - g\ :sub:`5` + - g\ :sub:`4` + - g\ :sub:`3` + - g\ :sub:`2` + - g\ :sub:`1` + - g\ :sub:`0` + - b\ :sub:`15` + - b\ :sub:`14` + - b\ :sub:`13` + - b\ :sub:`12` + - b\ :sub:`11` + - b\ :sub:`10` + - b\ :sub:`9` + - b\ :sub:`8` + - b\ :sub:`7` + - b\ :sub:`6` + - b\ :sub:`5` + - b\ :sub:`4` + - b\ :sub:`3` + - b\ :sub:`2` + - b\ :sub:`1` + - b\ :sub:`0` + +.. raw:: latex + + \endgroup + +On LVDS buses, usually each sample is transferred serialized in seven +time slots per pixel clock, on three (18-bit) or four (24-bit) +differential data pairs at the same time. The remaining bits are used +for control signals as defined by SPWG/PSWG/VESA or JEIDA standards. The +24-bit RGB format serialized in seven time slots on four lanes using +JEIDA defined bit mapping will be named +``MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA``, for example. + +.. raw:: latex + + \begin{adjustbox}{width=\columnwidth} + +.. _v4l2-mbus-pixelcode-rgb-lvds: + +.. flat-table:: LVDS RGB formats + :header-rows: 2 + :stub-columns: 0 + + * - Identifier + - Code + - + - + - :cspan:`3` Data organization + * - + - + - Timeslot + - Lane + - 3 + - 2 + - 1 + - 0 * .. _MEDIA-BUS-FMT-RGB666-1X7X3-SPWG: - MEDIA_BUS_FMT_RGB666_1X7X3_SPWG @@ -2387,14 +3042,14 @@ the following codes. \tiny \setlength{\tabcolsep}{2pt} -.. tabularcolumns:: |p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}| +.. tabularcolumns:: |p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}| .. _v4l2-mbus-pixelcode-yuv8: .. flat-table:: YUV Formats :header-rows: 2 :stub-columns: 0 - :widths: 36 7 3 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 + :widths: 36 7 3 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 * - Identifier - Code @@ -2403,6 +3058,22 @@ the following codes. * - - - Bit + - 47 + - 46 + - 45 + - 44 + - 43 + - 42 + - 41 + - 40 + - 39 + - 38 + - 37 + - 36 + - 35 + - 34 + - 33 + - 32 - 31 - 30 - 29 @@ -2464,6 +3135,22 @@ the following codes. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -2501,6 +3188,22 @@ the following codes. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - u\ :sub:`7` - u\ :sub:`6` - u\ :sub:`5` @@ -2536,6 +3239,22 @@ the following codes. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - v\ :sub:`7` - v\ :sub:`6` - v\ :sub:`5` @@ -2573,6 +3292,22 @@ the following codes. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - u\ :sub:`7` - u\ :sub:`6` - u\ :sub:`5` @@ -2608,25 +3343,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - - - - - - - - - - - - - - - - - - - - - @@ -2678,25 +3394,6 @@ the following codes. - - - - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * - - - - - - - - - - - - - - - - - - - - - - - - @@ -2748,27 +3445,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-VYUY8-1_5X8: - - - MEDIA_BUS_FMT_VYUY8_1_5X8 - - 0x2003 - - - - - - - - - - - - - - - - - - - - - @@ -2820,25 +3496,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - - - - - - - - - - - - - - - - - - - - - @@ -2890,25 +3547,6 @@ the following codes. - - - - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - * - - - - - - - - - - - - - - - - - - - - - - - - @@ -2933,7 +3571,10 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * - + * .. _MEDIA-BUS-FMT-VYUY8-1_5X8: + + - MEDIA_BUS_FMT_VYUY8_1_5X8 + - 0x2003 - - - @@ -2960,18 +3601,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-YUYV8-1_5X8: - - - MEDIA_BUS_FMT_YUYV8_1_5X8 - - 0x2004 - - - @@ -2987,6 +3616,21 @@ the following codes. - - - + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * - + - + - + - + - + - + - - - - @@ -2997,15 +3641,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -3067,25 +3702,6 @@ the following codes. - - - - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - * - - - - - - - - - - - - - - - - - - - - - - - - @@ -3137,15 +3753,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -3162,6 +3769,22 @@ the following codes. - - - + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * - + - + - + - + - + - + - + - - - - @@ -3172,18 +3795,6 @@ the following codes. - - - - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * .. _MEDIA-BUS-FMT-YVYU8-1_5X8: - - - MEDIA_BUS_FMT_YVYU8_1_5X8 - - 0x2005 - - - @@ -3244,15 +3855,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -3269,6 +3871,23 @@ the following codes. - - - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-YUYV8-1_5X8: + + - MEDIA_BUS_FMT_YUYV8_1_5X8 + - 0x2004 + - + - + - + - + - - - - @@ -3279,15 +3898,6 @@ the following codes. - - - - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * - - - - @@ -3349,15 +3959,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -3374,6 +3975,22 @@ the following codes. - - - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - - - - @@ -3384,18 +4001,6 @@ the following codes. - - - - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - * .. _MEDIA-BUS-FMT-UYVY8-2X8: - - - MEDIA_BUS_FMT_UYVY8_2X8 - - 0x2006 - - - @@ -3456,6 +4061,22 @@ the following codes. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -3491,15 +4112,6 @@ the following codes. - - - - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * - - - - @@ -3516,6 +4128,22 @@ the following codes. - - - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - - - - @@ -3526,18 +4154,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-VYUY8-2X8: - - - MEDIA_BUS_FMT_VYUY8_2X8 - - 0x2007 - - - @@ -3571,7 +4187,10 @@ the following codes. - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` - * - + * .. _MEDIA-BUS-FMT-YVYU8-1_5X8: + + - MEDIA_BUS_FMT_YVYU8_1_5X8 + - 0x2005 - - - @@ -3598,15 +4217,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -3622,6 +4232,20 @@ the following codes. - - - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - - - - @@ -3633,15 +4257,6 @@ the following codes. - - - - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - * - - - - @@ -3676,10 +4291,7 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-YUYV8-2X8: - - - MEDIA_BUS_FMT_YUYV8_2X8 - - 0x2008 + * - - - - @@ -3705,15 +4317,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -3731,6 +4334,22 @@ the following codes. - - - + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * - + - + - + - + - + - + - + - - - - @@ -3740,15 +4359,6 @@ the following codes. - - - - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - * - - - - @@ -3810,27 +4420,6 @@ the following codes. - - - - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * .. _MEDIA-BUS-FMT-YVYU8-2X8: - - - MEDIA_BUS_FMT_YVYU8_2X8 - - 0x2009 - - - - - - - - - - - - - - - - - - - - - @@ -3882,15 +4471,6 @@ the following codes. - - - - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * - - - - @@ -3907,6 +4487,23 @@ the following codes. - - - + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * .. _MEDIA-BUS-FMT-UYVY8-2X8: + + - MEDIA_BUS_FMT_UYVY8_2X8 + - 0x2006 + - + - + - + - + - - - - @@ -3917,15 +4514,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -3960,14 +4548,7 @@ the following codes. - u\ :sub:`2` - u\ :sub:`1` - u\ :sub:`0` - * .. _MEDIA-BUS-FMT-Y10-1X10: - - - MEDIA_BUS_FMT_Y10_1X10 - - 0x200a - - - - - - - - + * - - - - @@ -3987,20 +4568,6 @@ the following codes. - - - - - y\ :sub:`9` - - y\ :sub:`8` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-UYVY10-2X10: - - - MEDIA_BUS_FMT_UYVY10_2X10 - - 0x2018 - - - @@ -4024,16 +4591,14 @@ the following codes. - - - - - u\ :sub:`9` - - u\ :sub:`8` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` * - - - @@ -4059,23 +4624,6 @@ the following codes. - - - - - y\ :sub:`9` - - y\ :sub:`8` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - - - - - - - - - - - - - @@ -4094,8 +4642,6 @@ the following codes. - - - - - v\ :sub:`9` - - v\ :sub:`8` - v\ :sub:`7` - v\ :sub:`6` - v\ :sub:`5` @@ -4129,20 +4675,6 @@ the following codes. - - - - - y\ :sub:`9` - - y\ :sub:`8` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-VYUY10-2X10: - - - MEDIA_BUS_FMT_VYUY10_2X10 - - 0x2019 - - - @@ -4161,22 +4693,23 @@ the following codes. - - - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-VYUY8-2X8: + + - MEDIA_BUS_FMT_VYUY8_2X8 + - 0x2007 - - - - - - - v\ :sub:`9` - - v\ :sub:`8` - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * - - - - @@ -4201,17 +4734,6 @@ the following codes. - - - - - y\ :sub:`9` - - y\ :sub:`8` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -4224,6 +4746,21 @@ the following codes. - - - + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * - + - + - + - + - + - + - - - - @@ -4236,17 +4773,6 @@ the following codes. - - - - - u\ :sub:`9` - - u\ :sub:`8` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - * - - - - @@ -4271,8 +4797,6 @@ the following codes. - - - - - y\ :sub:`9` - - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -4281,15 +4805,7 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-YUYV10-2X10: - - - MEDIA_BUS_FMT_YUYV10_2X10 - - 0x200b - - - - - - - - - - + * - - - - @@ -4308,17 +4824,6 @@ the following codes. - - - - - y\ :sub:`9` - - y\ :sub:`8` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -4343,8 +4848,6 @@ the following codes. - - - - - u\ :sub:`9` - - u\ :sub:`8` - u\ :sub:`7` - u\ :sub:`6` - u\ :sub:`5` @@ -4378,8 +4881,24 @@ the following codes. - - - - - y\ :sub:`9` - - y\ :sub:`8` + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -4388,13 +4907,10 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * - - - - - - - - - - - - - + * .. _MEDIA-BUS-FMT-YUYV8-2X8: + + - MEDIA_BUS_FMT_YUYV8_2X8 + - 0x2008 - - - @@ -4413,20 +4929,6 @@ the following codes. - - - - - v\ :sub:`9` - - v\ :sub:`8` - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * .. _MEDIA-BUS-FMT-YVYU10-2X10: - - - MEDIA_BUS_FMT_YVYU10_2X10 - - 0x200c - - - @@ -4450,8 +4952,6 @@ the following codes. - - - - - y\ :sub:`9` - - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -4485,23 +4985,6 @@ the following codes. - - - - - v\ :sub:`9` - - v\ :sub:`8` - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * - - - - - - - - - - - - - - - - @@ -4520,16 +5003,14 @@ the following codes. - - - - - y\ :sub:`9` - - y\ :sub:`8` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` * - - - @@ -4555,23 +5036,6 @@ the following codes. - - - - - u\ :sub:`9` - - u\ :sub:`8` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - * .. _MEDIA-BUS-FMT-Y12-1X12: - - - MEDIA_BUS_FMT_Y12_1X12 - - 0x2013 - - - - - - - - - @@ -4590,10 +5054,6 @@ the following codes. - - - - - y\ :sub:`11` - - y\ :sub:`10` - - y\ :sub:`9` - - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -4602,14 +5062,7 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-UYVY12-2X12: - - - MEDIA_BUS_FMT_UYVY12_2X12 - - 0x201c - - - - - - - - + * - - - - @@ -4627,19 +5080,6 @@ the following codes. - - - - - u\ :sub:`11` - - u\ :sub:`10` - - u\ :sub:`9` - - u\ :sub:`8` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - * - - - - @@ -4662,22 +5102,21 @@ the following codes. - - - - - y\ :sub:`11` - - y\ :sub:`10` - - y\ :sub:`9` - - y\ :sub:`8` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * .. _MEDIA-BUS-FMT-YVYU8-2X8: + + - MEDIA_BUS_FMT_YVYU8_2X8 + - 0x2009 - - - @@ -4697,19 +5136,6 @@ the following codes. - - - - - v\ :sub:`11` - - v\ :sub:`10` - - v\ :sub:`9` - - v\ :sub:`8` - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * - - - - @@ -4732,10 +5158,6 @@ the following codes. - - - - - y\ :sub:`11` - - y\ :sub:`10` - - y\ :sub:`9` - - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -4744,10 +5166,28 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-VYUY12-2X12: - - - MEDIA_BUS_FMT_VYUY12_2X12 - - 0x201d + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - @@ -4769,10 +5209,6 @@ the following codes. - - - - - v\ :sub:`11` - - v\ :sub:`10` - - v\ :sub:`9` - - v\ :sub:`8` - v\ :sub:`7` - v\ :sub:`6` - v\ :sub:`5` @@ -4804,10 +5240,26 @@ the following codes. - - - - - y\ :sub:`11` - - y\ :sub:`10` - - y\ :sub:`9` - - y\ :sub:`8` + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -4839,10 +5291,26 @@ the following codes. - - - - - u\ :sub:`11` - - u\ :sub:`10` - - u\ :sub:`9` - - u\ :sub:`8` + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - u\ :sub:`7` - u\ :sub:`6` - u\ :sub:`5` @@ -4851,7 +5319,27 @@ the following codes. - u\ :sub:`2` - u\ :sub:`1` - u\ :sub:`0` - * - + * .. _MEDIA-BUS-FMT-Y10-1X10: + + - MEDIA_BUS_FMT_Y10_1X10 + - 0x200a + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - @@ -4874,8 +5362,6 @@ the following codes. - - - - - y\ :sub:`11` - - y\ :sub:`10` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -4886,14 +5372,10 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-YUYV12-2X12: + * .. _MEDIA-BUS-FMT-UYVY10-2X10: - - MEDIA_BUS_FMT_YUYV12_2X12 - - 0x201e - - - - - - - - + - MEDIA_BUS_FMT_UYVY10_2X10 + - 0x2018 - - - @@ -4911,19 +5393,6 @@ the following codes. - - - - - y\ :sub:`11` - - y\ :sub:`10` - - y\ :sub:`9` - - y\ :sub:`8` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -4946,8 +5415,6 @@ the following codes. - - - - - u\ :sub:`11` - - u\ :sub:`10` - u\ :sub:`9` - u\ :sub:`8` - u\ :sub:`7` @@ -4981,8 +5448,24 @@ the following codes. - - - - - y\ :sub:`11` - - y\ :sub:`10` + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5016,8 +5499,24 @@ the following codes. - - - - - v\ :sub:`11` - - v\ :sub:`10` + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - v\ :sub:`9` - v\ :sub:`8` - v\ :sub:`7` @@ -5028,10 +5527,26 @@ the following codes. - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` - * .. _MEDIA-BUS-FMT-YVYU12-2X12: - - - MEDIA_BUS_FMT_YVYU12_2X12 - - 0x201f + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - @@ -5053,8 +5568,6 @@ the following codes. - - - - - y\ :sub:`11` - - y\ :sub:`10` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5065,7 +5578,27 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * - + * .. _MEDIA-BUS-FMT-VYUY10-2X10: + + - MEDIA_BUS_FMT_VYUY10_2X10 + - 0x2019 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - @@ -5088,8 +5621,6 @@ the following codes. - - - - - v\ :sub:`11` - - v\ :sub:`10` - v\ :sub:`9` - v\ :sub:`8` - v\ :sub:`7` @@ -5123,8 +5654,24 @@ the following codes. - - - - - y\ :sub:`11` - - y\ :sub:`10` + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5158,22 +5705,6 @@ the following codes. - - - - - u\ :sub:`11` - - u\ :sub:`10` - - u\ :sub:`9` - - u\ :sub:`8` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - * .. _MEDIA-BUS-FMT-UYVY8-1X16: - - - MEDIA_BUS_FMT_UYVY8_1X16 - - 0x200f - - - @@ -5191,6 +5722,9 @@ the following codes. - - - + - + - u\ :sub:`9` + - u\ :sub:`8` - u\ :sub:`7` - u\ :sub:`6` - u\ :sub:`5` @@ -5199,14 +5733,6 @@ the following codes. - u\ :sub:`2` - u\ :sub:`1` - u\ :sub:`0` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` * - - - @@ -5226,60 +5752,10 @@ the following codes. - - - - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-VYUY8-1X16: - - - MEDIA_BUS_FMT_VYUY8_1X16 - - 0x2010 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - * - - - - @@ -5298,14 +5774,8 @@ the following codes. - - - - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` + - y\ :sub:`9` + - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -5314,10 +5784,12 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-YUYV8-1X16: + * .. _MEDIA-BUS-FMT-YUYV10-2X10: - - MEDIA_BUS_FMT_YUYV8_1X16 - - 0x2011 + - MEDIA_BUS_FMT_YUYV10_2X10 + - 0x200b + - + - - - - @@ -5335,23 +5807,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - * - - - - @@ -5370,6 +5825,10 @@ the following codes. - - - + - + - + - y\ :sub:`9` + - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -5378,18 +5837,7 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * .. _MEDIA-BUS-FMT-YVYU8-1X16: - - - MEDIA_BUS_FMT_YVYU8_1X16 - - 0x2012 + * - - - - @@ -5407,23 +5855,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - * - - - - @@ -5442,14 +5873,13 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` + - + - + - + - + - + - u\ :sub:`9` + - u\ :sub:`8` - u\ :sub:`7` - u\ :sub:`6` - u\ :sub:`5` @@ -5458,10 +5888,12 @@ the following codes. - u\ :sub:`2` - u\ :sub:`1` - u\ :sub:`0` - * .. _MEDIA-BUS-FMT-YDYUYDYV8-1X16: - - - MEDIA_BUS_FMT_YDYUYDYV8_1X16 - - 0x2014 + * - + - + - + - + - + - - - - @@ -5479,23 +5911,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - - d - - d - - d - - d - - d - - d - - d - - d - * - - - - @@ -5514,6 +5929,8 @@ the following codes. - - - + - y\ :sub:`9` + - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -5522,14 +5939,6 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` * - - - @@ -5549,23 +5958,6 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - - d - - d - - d - - d - - d - - d - - d - - d - * - - - - @@ -5584,14 +5976,12 @@ the following codes. - - - - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` + - + - + - + - + - v\ :sub:`9` + - v\ :sub:`8` - v\ :sub:`7` - v\ :sub:`6` - v\ :sub:`5` @@ -5600,10 +5990,36 @@ the following codes. - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` - * .. _MEDIA-BUS-FMT-UYVY10-1X20: + * .. _MEDIA-BUS-FMT-YVYU10-2X10: - - MEDIA_BUS_FMT_UYVY10_1X20 - - 0x201a + - MEDIA_BUS_FMT_YVYU10_2X10 + - 0x200c + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - @@ -5617,16 +6033,6 @@ the following codes. - - - - - u\ :sub:`9` - - u\ :sub:`8` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5652,16 +6058,2363 @@ the following codes. - - - - - v\ :sub:`9` - - v\ :sub:`8` - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * .. _MEDIA-BUS-FMT-Y12-1X12: + + - MEDIA_BUS_FMT_Y12_1X12 + - 0x2013 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-UYVY12-2X12: + + - MEDIA_BUS_FMT_UYVY12_2X12 + - 0x201c + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`11` + - u\ :sub:`10` + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`11` + - v\ :sub:`10` + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-VYUY12-2X12: + + - MEDIA_BUS_FMT_VYUY12_2X12 + - 0x201d + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`11` + - v\ :sub:`10` + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`11` + - u\ :sub:`10` + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-YUYV12-2X12: + + - MEDIA_BUS_FMT_YUYV12_2X12 + - 0x201e + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`11` + - u\ :sub:`10` + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`11` + - v\ :sub:`10` + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * .. _MEDIA-BUS-FMT-YVYU12-2X12: + + - MEDIA_BUS_FMT_YVYU12_2X12 + - 0x201f + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`11` + - v\ :sub:`10` + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`11` + - u\ :sub:`10` + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * .. _MEDIA-BUS-FMT-UYVY8-1X16: + + - MEDIA_BUS_FMT_UYVY8_1X16 + - 0x200f + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-VYUY8-1X16: + + - MEDIA_BUS_FMT_VYUY8_1X16 + - 0x2010 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-YUYV8-1X16: + + - MEDIA_BUS_FMT_YUYV8_1X16 + - 0x2011 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * .. _MEDIA-BUS-FMT-YVYU8-1X16: + + - MEDIA_BUS_FMT_YVYU8_1X16 + - 0x2012 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * .. _MEDIA-BUS-FMT-YDYUYDYV8-1X16: + + - MEDIA_BUS_FMT_YDYUYDYV8_1X16 + - 0x2014 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - d + - d + - d + - d + - d + - d + - d + - d + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - d + - d + - d + - d + - d + - d + - d + - d + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * .. _MEDIA-BUS-FMT-UYVY10-1X20: + + - MEDIA_BUS_FMT_UYVY10_1X20 + - 0x201a + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-VYUY10-1X20: + + - MEDIA_BUS_FMT_VYUY10_1X20 + - 0x201b + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-YUYV10-1X20: + + - MEDIA_BUS_FMT_YUYV10_1X20 + - 0x200d + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * .. _MEDIA-BUS-FMT-YVYU10-1X20: + + - MEDIA_BUS_FMT_YVYU10_1X20 + - 0x200e + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + * .. _MEDIA-BUS-FMT-VUY8-1X24: + + - MEDIA_BUS_FMT_VUY8_1X24 + - 0x201a + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-YUV8-1X24: + + - MEDIA_BUS_FMT_YUV8_1X24 + - 0x2025 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + * .. _MEDIA-BUS-FMT-UYVY8-1-1X24: + + - MEDIA_BUS_FMT_UYVY8_1_1X24 + - 0x2026 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-UYVY12-1X24: + + - MEDIA_BUS_FMT_UYVY12_1X24 + - 0x2020 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`11` + - u\ :sub:`10` + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`11` + - v\ :sub:`10` + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` - v\ :sub:`4` - v\ :sub:`3` - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` + - y\ :sub:`11` + - y\ :sub:`10` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5672,10 +8425,14 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-VYUY10-1X20: + * .. _MEDIA-BUS-FMT-VYUY12-1X24: - - MEDIA_BUS_FMT_VYUY10_1X20 - - 0x201b + - MEDIA_BUS_FMT_VYUY12_1X24 + - 0x2021 + - + - + - + - - - - @@ -5689,6 +8446,16 @@ the following codes. - - - + - + - + - + - + - + - + - + - + - v\ :sub:`11` + - v\ :sub:`10` - v\ :sub:`9` - v\ :sub:`8` - v\ :sub:`7` @@ -5699,6 +8466,8 @@ the following codes. - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` + - y\ :sub:`11` + - y\ :sub:`10` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5724,6 +8493,20 @@ the following codes. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`11` + - u\ :sub:`10` - u\ :sub:`9` - u\ :sub:`8` - u\ :sub:`7` @@ -5734,6 +8517,8 @@ the following codes. - u\ :sub:`2` - u\ :sub:`1` - u\ :sub:`0` + - y\ :sub:`11` + - y\ :sub:`10` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5744,10 +8529,16 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-YUYV10-1X20: + * .. _MEDIA-BUS-FMT-YUYV12-1X24: - - MEDIA_BUS_FMT_YUYV10_1X20 - - 0x200d + - MEDIA_BUS_FMT_YUYV12_1X24 + - 0x2022 + - + - + - + - + - + - - - - @@ -5761,6 +8552,14 @@ the following codes. - - - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5771,6 +8570,8 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` + - u\ :sub:`11` + - u\ :sub:`10` - u\ :sub:`9` - u\ :sub:`8` - u\ :sub:`7` @@ -5796,6 +8597,20 @@ the following codes. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5806,6 +8621,8 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` + - v\ :sub:`11` + - v\ :sub:`10` - v\ :sub:`9` - v\ :sub:`8` - v\ :sub:`7` @@ -5816,10 +8633,18 @@ the following codes. - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` - * .. _MEDIA-BUS-FMT-YVYU10-1X20: + * .. _MEDIA-BUS-FMT-YVYU12-1X24: - - MEDIA_BUS_FMT_YVYU10_1X20 - - 0x200e + - MEDIA_BUS_FMT_YVYU12_1X24 + - 0x2023 + - + - + - + - + - + - + - + - - - - @@ -5833,6 +8658,12 @@ the following codes. - - - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5843,6 +8674,8 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` + - v\ :sub:`11` + - v\ :sub:`10` - v\ :sub:`9` - v\ :sub:`8` - v\ :sub:`7` @@ -5868,6 +8701,20 @@ the following codes. - - - + - + - + - + - + - + - + - + - + - + - + - + - + - y\ :sub:`11` + - y\ :sub:`10` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -5878,6 +8725,8 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` + - u\ :sub:`11` + - u\ :sub:`10` - u\ :sub:`9` - u\ :sub:`8` - u\ :sub:`7` @@ -5888,10 +8737,12 @@ the following codes. - u\ :sub:`2` - u\ :sub:`1` - u\ :sub:`0` - * .. _MEDIA-BUS-FMT-VUY8-1X24: + * .. _MEDIA-BUS-FMT-YUV10-1X30: - - MEDIA_BUS_FMT_VUY8_1X24 - - 0x201a + - MEDIA_BUS_FMT_YUV10_1X30 + - 0x2016 + - + - - - - @@ -5901,6 +8752,36 @@ the following codes. - - - + - + - + - + - + - + - + - + - + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + - v\ :sub:`9` + - v\ :sub:`8` - v\ :sub:`7` - v\ :sub:`6` - v\ :sub:`5` @@ -5909,6 +8790,31 @@ the following codes. - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` + * .. _MEDIA-BUS-FMT-UYVY10-1-1X30: + + - MEDIA_BUS_FMT_UYVY10_1_1X30 + - 0x2027 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - u\ :sub:`9` + - u\ :sub:`8` - u\ :sub:`7` - u\ :sub:`6` - u\ :sub:`5` @@ -5917,6 +8823,69 @@ the following codes. - u\ :sub:`2` - u\ :sub:`1` - u\ :sub:`0` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - v\ :sub:`9` + - v\ :sub:`8` + - v\ :sub:`7` + - v\ :sub:`6` + - v\ :sub:`5` + - v\ :sub:`4` + - v\ :sub:`3` + - v\ :sub:`2` + - v\ :sub:`1` + - v\ :sub:`0` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - y\ :sub:`9` + - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -5925,10 +8894,17 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-YUV8-1X24: + * .. _MEDIA-BUS-FMT-AYUV8-1X32: - - MEDIA_BUS_FMT_YUV8_1X24 - - 0x2025 + - MEDIA_BUS_FMT_AYUV8_1X32 + - 0x2017 + - + - + - + - + - + - + - - - - @@ -5938,6 +8914,15 @@ the following codes. - - - + - + - a\ :sub:`7` + - a\ :sub:`6` + - a\ :sub:`5` + - a\ :sub:`4` + - a\ :sub:`3` + - a\ :sub:`2` + - a\ :sub:`1` + - a\ :sub:`0` - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -5962,10 +8947,14 @@ the following codes. - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` - * .. _MEDIA-BUS-FMT-UYVY12-1X24: + * .. _MEDIA-BUS-FMT-UYVY12-1-1X36: - - MEDIA_BUS_FMT_UYVY12_1X24 - - 0x2020 + - MEDIA_BUS_FMT_UYVY12_1_1X36 + - 0x2028 + - + - + - + - - - - @@ -5999,32 +8988,9 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * - - - - - - - - - - - - - - - - - - - - - - - v\ :sub:`11` - - v\ :sub:`10` - - v\ :sub:`9` - - v\ :sub:`8` - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` - y\ :sub:`11` - y\ :sub:`10` - - y\ :sub:`9` + - y\ :sub:`8` - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` @@ -6034,10 +9000,12 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-VYUY12-1X24: - - - MEDIA_BUS_FMT_VYUY12_1X24 - - 0x2021 + * - + - + - + - + - + - - - - @@ -6071,32 +9039,9 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * - - - - - - - - - - - - - - - - - - - - - - - u\ :sub:`11` - - u\ :sub:`10` - - u\ :sub:`9` - - u\ :sub:`8` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - y\ :sub:`11` - y\ :sub:`10` - - y\ :sub:`9` + - y\ :sub:`8` - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` @@ -6106,10 +9051,14 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - * .. _MEDIA-BUS-FMT-YUYV12-1X24: + * .. _MEDIA-BUS-FMT-YUV12-1X36: - - MEDIA_BUS_FMT_YUYV12_1X24 - - 0x2022 + - MEDIA_BUS_FMT_YUV12_1X36 + - 0x2029 + - + - + - + - - - - @@ -6121,7 +9070,7 @@ the following codes. - - y\ :sub:`11` - y\ :sub:`10` - - y\ :sub:`9` + - y\ :sub:`8` - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` @@ -6131,6 +9080,7 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` + - v\ :sub:`11` - u\ :sub:`11` - u\ :sub:`10` - u\ :sub:`9` @@ -6143,30 +9093,6 @@ the following codes. - u\ :sub:`2` - u\ :sub:`1` - u\ :sub:`0` - * - - - - - - - - - - - - - - - - - - - - - - - y\ :sub:`11` - - y\ :sub:`10` - - y\ :sub:`9` - - y\ :sub:`8` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` - - v\ :sub:`11` - v\ :sub:`10` - v\ :sub:`9` - v\ :sub:`8` @@ -6178,22 +9104,17 @@ the following codes. - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` - * .. _MEDIA-BUS-FMT-YVYU12-1X24: - - - MEDIA_BUS_FMT_YVYU12_1X24 - - 0x2023 - - - - - - - - - - - - - - - - - - + * .. _MEDIA-BUS-FMT-YUV16-1X48: + + - MEDIA_BUS_FMT_YUV16_1X48 + - 0x202a + - y\ :sub:`15` + - y\ :sub:`14` + - y\ :sub:`13` + - y\ :sub:`12` - y\ :sub:`11` - y\ :sub:`10` - - y\ :sub:`9` + - y\ :sub:`8` - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` @@ -6203,6 +9124,26 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` + - u\ :sub:`15` + - u\ :sub:`14` + - u\ :sub:`13` + - u\ :sub:`12` + - u\ :sub:`11` + - u\ :sub:`10` + - u\ :sub:`9` + - u\ :sub:`8` + - u\ :sub:`7` + - u\ :sub:`6` + - u\ :sub:`5` + - u\ :sub:`4` + - u\ :sub:`3` + - u\ :sub:`2` + - u\ :sub:`1` + - u\ :sub:`0` + - v\ :sub:`15` + - v\ :sub:`14` + - v\ :sub:`13` + - v\ :sub:`12` - v\ :sub:`11` - v\ :sub:`10` - v\ :sub:`9` @@ -6215,29 +9156,14 @@ the following codes. - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` - * - - - - - - - - - - - - - - - - - - - - - - - y\ :sub:`11` - - y\ :sub:`10` - - y\ :sub:`9` - - y\ :sub:`8` - - y\ :sub:`7` - - y\ :sub:`6` - - y\ :sub:`5` - - y\ :sub:`4` - - y\ :sub:`3` - - y\ :sub:`2` - - y\ :sub:`1` - - y\ :sub:`0` + * .. _MEDIA-BUS-FMT-UYVY16-1-1X48: + + - MEDIA_BUS_FMT_UYVY16_1_1X48 + - 0x202b + - u\ :sub:`15` + - u\ :sub:`14` + - u\ :sub:`13` + - u\ :sub:`12` - u\ :sub:`11` - u\ :sub:`10` - u\ :sub:`9` @@ -6250,13 +9176,12 @@ the following codes. - u\ :sub:`2` - u\ :sub:`1` - u\ :sub:`0` - * .. _MEDIA-BUS-FMT-YUV10-1X30: - - - MEDIA_BUS_FMT_YUV10_1X30 - - 0x2016 - - - - - - + - y\ :sub:`15` + - y\ :sub:`14` + - y\ :sub:`13` + - y\ :sub:`12` + - y\ :sub:`11` + - y\ :sub:`10` - y\ :sub:`9` - y\ :sub:`8` - y\ :sub:`7` @@ -6267,16 +9192,30 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - - u\ :sub:`9` - - u\ :sub:`8` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` + - y\ :sub:`15` + - y\ :sub:`14` + - y\ :sub:`13` + - y\ :sub:`12` + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`8` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + * - + - + - v\ :sub:`15` + - v\ :sub:`14` + - v\ :sub:`13` + - v\ :sub:`12` + - v\ :sub:`11` + - v\ :sub:`10` - v\ :sub:`9` - v\ :sub:`8` - v\ :sub:`7` @@ -6287,19 +9226,30 @@ the following codes. - v\ :sub:`2` - v\ :sub:`1` - v\ :sub:`0` - * .. _MEDIA-BUS-FMT-AYUV8-1X32: - - - MEDIA_BUS_FMT_AYUV8_1X32 - - 0x2017 - - - - a\ :sub:`7` - - a\ :sub:`6` - - a\ :sub:`5` - - a\ :sub:`4` - - a\ :sub:`3` - - a\ :sub:`2` - - a\ :sub:`1` - - a\ :sub:`0` + - y\ :sub:`15` + - y\ :sub:`14` + - y\ :sub:`13` + - y\ :sub:`12` + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`9` + - y\ :sub:`8` + - y\ :sub:`7` + - y\ :sub:`6` + - y\ :sub:`5` + - y\ :sub:`4` + - y\ :sub:`3` + - y\ :sub:`2` + - y\ :sub:`1` + - y\ :sub:`0` + - y\ :sub:`15` + - y\ :sub:`14` + - y\ :sub:`13` + - y\ :sub:`12` + - y\ :sub:`11` + - y\ :sub:`10` + - y\ :sub:`8` + - y\ :sub:`8` - y\ :sub:`7` - y\ :sub:`6` - y\ :sub:`5` @@ -6308,22 +9258,6 @@ the following codes. - y\ :sub:`2` - y\ :sub:`1` - y\ :sub:`0` - - u\ :sub:`7` - - u\ :sub:`6` - - u\ :sub:`5` - - u\ :sub:`4` - - u\ :sub:`3` - - u\ :sub:`2` - - u\ :sub:`1` - - u\ :sub:`0` - - v\ :sub:`7` - - v\ :sub:`6` - - v\ :sub:`5` - - v\ :sub:`4` - - v\ :sub:`3` - - v\ :sub:`2` - - v\ :sub:`1` - - v\ :sub:`0` .. raw:: latex -- 1.9.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v3 3/6] documentation: media: Add documentation for new RGB and YUV bus formats 2017-03-07 16:42 ` [PATCH v3 3/6] documentation: media: Add documentation for new RGB and YUV bus formats Neil Armstrong @ 2017-03-16 17:01 ` Archit Taneja 2017-03-17 16:11 ` Neil Armstrong 2017-03-20 14:33 ` Hans Verkuil 1 sibling, 1 reply; 24+ messages in thread From: Archit Taneja @ 2017-03-16 17:01 UTC (permalink / raw) To: linus-amlogic On 3/7/2017 10:12 PM, Neil Armstrong wrote: > Add documentation for added Bus Formats to describe RGB and YUS formats used s/YUS/YUV > as input to the Synopsys DesignWare HDMI TX Controller. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Documentation/media/uapi/v4l/subdev-formats.rst | 4992 ++++++++++++++++++----- > 1 file changed, 3963 insertions(+), 1029 deletions(-) Do we know if there is a better way to add more columns without adding so many lines? If not, one option could be to create a separate tables for 48 bit RGB formats, 48 bit YUV formats etc. <snip> Thanks, Archit -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 3/6] documentation: media: Add documentation for new RGB and YUV bus formats 2017-03-16 17:01 ` Archit Taneja @ 2017-03-17 16:11 ` Neil Armstrong 2017-03-20 15:04 ` Hans Verkuil 0 siblings, 1 reply; 24+ messages in thread From: Neil Armstrong @ 2017-03-17 16:11 UTC (permalink / raw) To: linus-amlogic On 03/16/2017 06:01 PM, Archit Taneja wrote: > > > On 3/7/2017 10:12 PM, Neil Armstrong wrote: >> Add documentation for added Bus Formats to describe RGB and YUS formats used > > s/YUS/YUV Thanks again.... > >> as input to the Synopsys DesignWare HDMI TX Controller. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> Documentation/media/uapi/v4l/subdev-formats.rst | 4992 ++++++++++++++++++----- >> 1 file changed, 3963 insertions(+), 1029 deletions(-) > > Do we know if there is a better way to add more columns without > adding so many lines? It seems not, the reason is written in the commands. > If not, one option could be to create a separate tables for > 48 bit RGB formats, 48 bit YUV formats etc. It would be simple indeed, any V4L guys for an advice here ? Thanks, Neil > > <snip> > > Thanks, > Archit > ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 3/6] documentation: media: Add documentation for new RGB and YUV bus formats 2017-03-17 16:11 ` Neil Armstrong @ 2017-03-20 15:04 ` Hans Verkuil 0 siblings, 0 replies; 24+ messages in thread From: Hans Verkuil @ 2017-03-20 15:04 UTC (permalink / raw) To: linus-amlogic On 03/17/2017 05:11 PM, Neil Armstrong wrote: > On 03/16/2017 06:01 PM, Archit Taneja wrote: >> >> >> On 3/7/2017 10:12 PM, Neil Armstrong wrote: >>> Add documentation for added Bus Formats to describe RGB and YUS formats used >> >> s/YUS/YUV > > Thanks again.... > >> >>> as input to the Synopsys DesignWare HDMI TX Controller. >>> >>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >>> --- >>> Documentation/media/uapi/v4l/subdev-formats.rst | 4992 ++++++++++++++++++----- >>> 1 file changed, 3963 insertions(+), 1029 deletions(-) >> >> Do we know if there is a better way to add more columns without >> adding so many lines? > > It seems not, the reason is written in the commands. > >> If not, one option could be to create a separate tables for >> 48 bit RGB formats, 48 bit YUV formats etc. > > It would be simple indeed, any V4L guys for an advice here ? I would split up these large tables into separate tables, depending on the number of bits each pixel uses: so an RGB table for 8 bits, 9-16 bits, 17-24, 25-32, 33-48. This also avoids a major problem where the horizontal scrollbar is at the bottom of the table, but the column numbering is at the top and out of sight if the table is long. It also prevents these large horizontal widths when they are not needed. Regards, Hans ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 3/6] documentation: media: Add documentation for new RGB and YUV bus formats 2017-03-07 16:42 ` [PATCH v3 3/6] documentation: media: Add documentation for new RGB and YUV bus formats Neil Armstrong 2017-03-16 17:01 ` Archit Taneja @ 2017-03-20 14:33 ` Hans Verkuil 1 sibling, 0 replies; 24+ messages in thread From: Hans Verkuil @ 2017-03-20 14:33 UTC (permalink / raw) To: linus-amlogic On 03/07/2017 05:42 PM, Neil Armstrong wrote: > Add documentation for added Bus Formats to describe RGB and YUS formats used > as input to the Synopsys DesignWare HDMI TX Controller. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Documentation/media/uapi/v4l/subdev-formats.rst | 4992 ++++++++++++++++++----- > 1 file changed, 3963 insertions(+), 1029 deletions(-) > > diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst > index d6152c9..feb55b5 100644 > --- a/Documentation/media/uapi/v4l/subdev-formats.rst > +++ b/Documentation/media/uapi/v4l/subdev-formats.rst > @@ -114,7 +114,7 @@ The following tables list existing packed RGB formats. > .. it switches to long table, and there's no way to override it. > > > -.. tabularcolumns:: |p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}| > +.. tabularcolumns:: |p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}| > > .. _v4l2-mbus-pixelcode-rgb: > <snip> > + * .. _MEDIA-BUS-FMT-RGB161616-1X48: > + > + - MEDIA_BUS_FMT_RGB161616_1X48 > + - 0x10 0x10 -> 0x101a > + - > + - r\ :sub:`15` <snip> > + * .. _MEDIA-BUS-FMT-YUV16-1X48: > + > + - MEDIA_BUS_FMT_YUV16_1X48 > + - 0x202a Needs an extra line: - The first cell is the 'Bit' column, which should be an empty cell. If you look at the output, then you'll see that without this the bit 0 cell is empty. Same for the other three 48 bit YUV formats. > + - y\ :sub:`15` > + - y\ :sub:`14` > + - y\ :sub:`13` > + - y\ :sub:`12` > - y\ :sub:`11` > - y\ :sub:`10` > - - y\ :sub:`9` > + - y\ :sub:`8` Typo: should remain 9. > - y\ :sub:`8` > - y\ :sub:`7` > - y\ :sub:`6` > @@ -6203,6 +9124,26 @@ the following codes. > - y\ :sub:`2` > - y\ :sub:`1` > - y\ :sub:`0` > + - u\ :sub:`15` > + - u\ :sub:`14` > + - u\ :sub:`13` > + - u\ :sub:`12` > + - u\ :sub:`11` > + - u\ :sub:`10` > + - u\ :sub:`9` > + - u\ :sub:`8` > + - u\ :sub:`7` > + - u\ :sub:`6` > + - u\ :sub:`5` > + - u\ :sub:`4` > + - u\ :sub:`3` > + - u\ :sub:`2` > + - u\ :sub:`1` > + - u\ :sub:`0` > + - v\ :sub:`15` > + - v\ :sub:`14` > + - v\ :sub:`13` > + - v\ :sub:`12` > - v\ :sub:`11` > - v\ :sub:`10` > - v\ :sub:`9` > @@ -6215,29 +9156,14 @@ the following codes. > - v\ :sub:`2` > - v\ :sub:`1` > - v\ :sub:`0` > - * - > - - > - - > - - > - - > - - > - - > - - > - - > - - > - - > - - y\ :sub:`11` > - - y\ :sub:`10` > - - y\ :sub:`9` > - - y\ :sub:`8` > - - y\ :sub:`7` > - - y\ :sub:`6` > - - y\ :sub:`5` > - - y\ :sub:`4` > - - y\ :sub:`3` > - - y\ :sub:`2` > - - y\ :sub:`1` > - - y\ :sub:`0` > + * .. _MEDIA-BUS-FMT-UYVY16-1-1X48: > + > + - MEDIA_BUS_FMT_UYVY16_1_1X48 > + - 0x202b > + - u\ :sub:`15` > + - u\ :sub:`14` > + - u\ :sub:`13` > + - u\ :sub:`12` > - u\ :sub:`11` > - u\ :sub:`10` > - u\ :sub:`9` > @@ -6250,13 +9176,12 @@ the following codes. > - u\ :sub:`2` > - u\ :sub:`1` > - u\ :sub:`0` > - * .. _MEDIA-BUS-FMT-YUV10-1X30: > - > - - MEDIA_BUS_FMT_YUV10_1X30 > - - 0x2016 > - - > - - > - - > + - y\ :sub:`15` > + - y\ :sub:`14` > + - y\ :sub:`13` > + - y\ :sub:`12` > + - y\ :sub:`11` > + - y\ :sub:`10` > - y\ :sub:`9` > - y\ :sub:`8` > - y\ :sub:`7` > @@ -6267,16 +9192,30 @@ the following codes. > - y\ :sub:`2` > - y\ :sub:`1` > - y\ :sub:`0` > - - u\ :sub:`9` > - - u\ :sub:`8` > - - u\ :sub:`7` > - - u\ :sub:`6` > - - u\ :sub:`5` > - - u\ :sub:`4` > - - u\ :sub:`3` > - - u\ :sub:`2` > - - u\ :sub:`1` > - - u\ :sub:`0` > + - y\ :sub:`15` > + - y\ :sub:`14` > + - y\ :sub:`13` > + - y\ :sub:`12` > + - y\ :sub:`11` > + - y\ :sub:`10` > + - y\ :sub:`8` 8 -> 9 > + - y\ :sub:`8` > + - y\ :sub:`7` > + - y\ :sub:`6` > + - y\ :sub:`5` > + - y\ :sub:`4` > + - y\ :sub:`3` > + - y\ :sub:`2` > + - y\ :sub:`1` > + - y\ :sub:`0` > + * - > + - > + - v\ :sub:`15` > + - v\ :sub:`14` > + - v\ :sub:`13` > + - v\ :sub:`12` > + - v\ :sub:`11` > + - v\ :sub:`10` > - v\ :sub:`9` > - v\ :sub:`8` > - v\ :sub:`7` > @@ -6287,19 +9226,30 @@ the following codes. > - v\ :sub:`2` > - v\ :sub:`1` > - v\ :sub:`0` > - * .. _MEDIA-BUS-FMT-AYUV8-1X32: > - > - - MEDIA_BUS_FMT_AYUV8_1X32 > - - 0x2017 > - - > - - a\ :sub:`7` > - - a\ :sub:`6` > - - a\ :sub:`5` > - - a\ :sub:`4` > - - a\ :sub:`3` > - - a\ :sub:`2` > - - a\ :sub:`1` > - - a\ :sub:`0` > + - y\ :sub:`15` > + - y\ :sub:`14` > + - y\ :sub:`13` > + - y\ :sub:`12` > + - y\ :sub:`11` > + - y\ :sub:`10` > + - y\ :sub:`9` > + - y\ :sub:`8` > + - y\ :sub:`7` > + - y\ :sub:`6` > + - y\ :sub:`5` > + - y\ :sub:`4` > + - y\ :sub:`3` > + - y\ :sub:`2` > + - y\ :sub:`1` > + - y\ :sub:`0` > + - y\ :sub:`15` > + - y\ :sub:`14` > + - y\ :sub:`13` > + - y\ :sub:`12` > + - y\ :sub:`11` > + - y\ :sub:`10` > + - y\ :sub:`8` 8 -> 9 > + - y\ :sub:`8` > - y\ :sub:`7` > - y\ :sub:`6` > - y\ :sub:`5` > @@ -6308,22 +9258,6 @@ the following codes. > - y\ :sub:`2` > - y\ :sub:`1` > - y\ :sub:`0` > - - u\ :sub:`7` > - - u\ :sub:`6` > - - u\ :sub:`5` > - - u\ :sub:`4` > - - u\ :sub:`3` > - - u\ :sub:`2` > - - u\ :sub:`1` > - - u\ :sub:`0` > - - v\ :sub:`7` > - - v\ :sub:`6` > - - v\ :sub:`5` > - - v\ :sub:`4` > - - v\ :sub:`3` > - - v\ :sub:`2` > - - v\ :sub:`1` > - - v\ :sub:`0` > > > .. raw:: latex > Regards, Hans ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings 2017-03-07 16:42 [PATCH v3 0/6] drm: bridge: dw-hdmi: Add support for Custom PHYs Neil Armstrong ` (2 preceding siblings ...) 2017-03-07 16:42 ` [PATCH v3 3/6] documentation: media: Add documentation for new RGB and YUV bus formats Neil Armstrong @ 2017-03-07 16:42 ` Neil Armstrong 2017-03-07 17:35 ` Jose Abreu 2017-03-07 16:42 ` [PATCH v3 5/6] drm: bridge: dw-hdmi: Add Documentation on supported input formats Neil Armstrong 2017-03-07 16:42 ` [PATCH v3 6/6] drm: bridge: dw-hdmi: Move HPD handling to PHY operations Neil Armstrong 5 siblings, 1 reply; 24+ messages in thread From: Neil Armstrong @ 2017-03-07 16:42 UTC (permalink / raw) To: linus-amlogic Some display pipelines can only provide non-RBG input pixels to the HDMI TX Controller, this patch takes the pixel format from the plat_data if provided. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 322 +++++++++++++++++++++--------- include/drm/bridge/dw_hdmi.h | 63 ++++++ 2 files changed, 290 insertions(+), 95 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 1ed8bc1..348311c 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -30,17 +30,14 @@ #include <drm/drm_encoder_slave.h> #include <drm/bridge/dw_hdmi.h> +#include <uapi/linux/media-bus-format.h> +#include <uapi/linux/videodev2.h> + #include "dw-hdmi.h" #include "dw-hdmi-audio.h" #define HDMI_EDID_LEN 512 -#define RGB 0 -#define YCBCR444 1 -#define YCBCR422_16BITS 2 -#define YCBCR422_8BITS 3 -#define XVYCC444 4 - enum hdmi_datamap { RGB444_8B = 0x01, RGB444_10B = 0x03, @@ -94,10 +91,10 @@ struct hdmi_vmode { }; struct hdmi_data_info { - unsigned int enc_in_format; - unsigned int enc_out_format; - unsigned int enc_color_depth; - unsigned int colorimetry; + unsigned int enc_in_bus_format; + unsigned int enc_out_bus_format; + unsigned int enc_in_encoding; + unsigned int enc_out_encoding; unsigned int pix_repet_factor; unsigned int hdcp_enable; struct hdmi_vmode video_mode; @@ -557,6 +554,92 @@ void dw_hdmi_audio_disable(struct dw_hdmi *hdmi) } EXPORT_SYMBOL_GPL(dw_hdmi_audio_disable); +static bool hdmi_bus_fmt_is_rgb(unsigned int bus_format) +{ + switch (bus_format) { + case MEDIA_BUS_FMT_RGB888_1X24: + case MEDIA_BUS_FMT_RGB101010_1X30: + case MEDIA_BUS_FMT_RGB121212_1X36: + case MEDIA_BUS_FMT_RGB161616_1X48: + return true; + + default: + return false; + } +} + +static bool hdmi_bus_fmt_is_yuv444(unsigned int bus_format) +{ + switch (bus_format) { + case MEDIA_BUS_FMT_YUV8_1X24: + case MEDIA_BUS_FMT_YUV10_1X30: + case MEDIA_BUS_FMT_YUV12_1X36: + case MEDIA_BUS_FMT_YUV16_1X48: + return true; + + default: + return false; + } +} + +static bool hdmi_bus_fmt_is_yuv422(unsigned int bus_format) +{ + switch (bus_format) { + case MEDIA_BUS_FMT_UYVY8_1X16: + case MEDIA_BUS_FMT_UYVY10_1X20: + case MEDIA_BUS_FMT_UYVY12_1X24: + return true; + + default: + return false; + } +} + +static bool hdmi_bus_fmt_is_yuv420(unsigned int bus_format) +{ + switch (bus_format) { + case MEDIA_BUS_FMT_UYVY8_1_1X24: + case MEDIA_BUS_FMT_UYVY10_1_1X30: + case MEDIA_BUS_FMT_UYVY12_1_1X36: + case MEDIA_BUS_FMT_UYVY16_1_1X48: + return true; + + default: + return false; + } +} + +static int hdmi_bus_fmt_color_depth(unsigned int bus_format) +{ + switch (bus_format) { + case MEDIA_BUS_FMT_RGB888_1X24: + case MEDIA_BUS_FMT_YUV8_1X24: + case MEDIA_BUS_FMT_UYVY8_1X16: + case MEDIA_BUS_FMT_UYVY8_1_1X24: + return 8; + + case MEDIA_BUS_FMT_RGB101010_1X30: + case MEDIA_BUS_FMT_YUV10_1X30: + case MEDIA_BUS_FMT_UYVY10_1X20: + case MEDIA_BUS_FMT_UYVY10_1_1X30: + return 10; + + case MEDIA_BUS_FMT_RGB121212_1X36: + case MEDIA_BUS_FMT_YUV12_1X36: + case MEDIA_BUS_FMT_UYVY12_1X24: + case MEDIA_BUS_FMT_UYVY12_1_1X36: + return 12; + + case MEDIA_BUS_FMT_RGB161616_1X48: + case MEDIA_BUS_FMT_YUV16_1X48: + case MEDIA_BUS_FMT_UYVY16_1_1X48: + return 16; + + default: + return 0; + } +} + /* * this submodule is responsible for the video data synchronization. * for example, for RGB 4:4:4 input, the data map is defined as @@ -569,37 +652,45 @@ static void hdmi_video_sample(struct dw_hdmi *hdmi) int color_format = 0; u8 val; - if (hdmi->hdmi_data.enc_in_format == RGB) { - if (hdmi->hdmi_data.enc_color_depth == 8) - color_format = 0x01; - else if (hdmi->hdmi_data.enc_color_depth == 10) - color_format = 0x03; - else if (hdmi->hdmi_data.enc_color_depth == 12) - color_format = 0x05; - else if (hdmi->hdmi_data.enc_color_depth == 16) - color_format = 0x07; - else - return; - } else if (hdmi->hdmi_data.enc_in_format == YCBCR444) { - if (hdmi->hdmi_data.enc_color_depth == 8) - color_format = 0x09; - else if (hdmi->hdmi_data.enc_color_depth == 10) - color_format = 0x0B; - else if (hdmi->hdmi_data.enc_color_depth == 12) - color_format = 0x0D; - else if (hdmi->hdmi_data.enc_color_depth == 16) - color_format = 0x0F; - else - return; - } else if (hdmi->hdmi_data.enc_in_format == YCBCR422_8BITS) { - if (hdmi->hdmi_data.enc_color_depth == 8) - color_format = 0x16; - else if (hdmi->hdmi_data.enc_color_depth == 10) - color_format = 0x14; - else if (hdmi->hdmi_data.enc_color_depth == 12) - color_format = 0x12; - else - return; + switch (hdmi->hdmi_data.enc_in_bus_format) { + case MEDIA_BUS_FMT_RGB888_1X24: + color_format = 0x01; + break; + case MEDIA_BUS_FMT_RGB101010_1X30: + color_format = 0x03; + break; + case MEDIA_BUS_FMT_RGB121212_1X36: + color_format = 0x05; + break; + case MEDIA_BUS_FMT_RGB161616_1X48: + color_format = 0x07; + break; + + case MEDIA_BUS_FMT_YUV8_1X24: + color_format = 0x09; + break; + case MEDIA_BUS_FMT_YUV10_1X30: + color_format = 0x0B; + break; + case MEDIA_BUS_FMT_YUV12_1X36: + color_format = 0x0D; + break; + case MEDIA_BUS_FMT_YUV16_1X48: + color_format = 0x0F; + break; + + case MEDIA_BUS_FMT_UYVY8_1X16: + color_format = 0x16; + break; + case MEDIA_BUS_FMT_UYVY10_1X20: + color_format = 0x14; + break; + case MEDIA_BUS_FMT_UYVY12_1X24: + color_format = 0x12; + break; + + default: + return; } val = HDMI_TX_INVID0_INTERNAL_DE_GENERATOR_DISABLE | @@ -622,26 +713,30 @@ static void hdmi_video_sample(struct dw_hdmi *hdmi) static int is_color_space_conversion(struct dw_hdmi *hdmi) { - return hdmi->hdmi_data.enc_in_format != hdmi->hdmi_data.enc_out_format; + return hdmi->hdmi_data.enc_in_bus_format != hdmi->hdmi_data.enc_out_bus_format; } static int is_color_space_decimation(struct dw_hdmi *hdmi) { - if (hdmi->hdmi_data.enc_out_format != YCBCR422_8BITS) + if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) return 0; - if (hdmi->hdmi_data.enc_in_format == RGB || - hdmi->hdmi_data.enc_in_format == YCBCR444) + + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_in_bus_format) || + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_in_bus_format)) return 1; + return 0; } static int is_color_space_interpolation(struct dw_hdmi *hdmi) { - if (hdmi->hdmi_data.enc_in_format != YCBCR422_8BITS) + if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_in_bus_format)) return 0; - if (hdmi->hdmi_data.enc_out_format == RGB || - hdmi->hdmi_data.enc_out_format == YCBCR444) + + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) || + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) return 1; + return 0; } @@ -652,15 +747,16 @@ static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi) u32 csc_scale = 1; if (is_color_space_conversion(hdmi)) { - if (hdmi->hdmi_data.enc_out_format == RGB) { - if (hdmi->hdmi_data.colorimetry == - HDMI_COLORIMETRY_ITU_601) + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) { + if (hdmi->hdmi_data.enc_out_encoding == + V4L2_YCBCR_ENC_601) csc_coeff = &csc_coeff_rgb_out_eitu601; else csc_coeff = &csc_coeff_rgb_out_eitu709; - } else if (hdmi->hdmi_data.enc_in_format == RGB) { - if (hdmi->hdmi_data.colorimetry == - HDMI_COLORIMETRY_ITU_601) + } else if (hdmi_bus_fmt_is_rgb( + hdmi->hdmi_data.enc_in_bus_format)) { + if (hdmi->hdmi_data.enc_out_encoding == + V4L2_YCBCR_ENC_601) csc_coeff = &csc_coeff_rgb_in_eitu601; else csc_coeff = &csc_coeff_rgb_in_eitu709; @@ -698,16 +794,23 @@ static void hdmi_video_csc(struct dw_hdmi *hdmi) else if (is_color_space_decimation(hdmi)) decimation = HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA3; - if (hdmi->hdmi_data.enc_color_depth == 8) + switch (hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format)) { + case 8: color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_24BPP; - else if (hdmi->hdmi_data.enc_color_depth == 10) + break; + case 10: color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_30BPP; - else if (hdmi->hdmi_data.enc_color_depth == 12) + break; + case 12: color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_36BPP; - else if (hdmi->hdmi_data.enc_color_depth == 16) + break; + case 16: color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_48BPP; - else + break; + + default: return; + } /* Configure the CSC registers */ hdmi_writeb(hdmi, interpolation | decimation, HDMI_CSC_CFG); @@ -730,32 +833,43 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi) struct hdmi_data_info *hdmi_data = &hdmi->hdmi_data; u8 val, vp_conf; - if (hdmi_data->enc_out_format == RGB || - hdmi_data->enc_out_format == YCBCR444) { - if (!hdmi_data->enc_color_depth) { - output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; - } else if (hdmi_data->enc_color_depth == 8) { + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) || + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) { + switch (hdmi_bus_fmt_color_depth( + hdmi->hdmi_data.enc_out_bus_format)) { + case 8: color_depth = 4; output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; - } else if (hdmi_data->enc_color_depth == 10) { + break; + case 10: color_depth = 5; - } else if (hdmi_data->enc_color_depth == 12) { + break; + case 12: color_depth = 6; - } else if (hdmi_data->enc_color_depth == 16) { + break; + case 16: color_depth = 7; - } else { - return; + break; + default: + output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; } - } else if (hdmi_data->enc_out_format == YCBCR422_8BITS) { - if (!hdmi_data->enc_color_depth || - hdmi_data->enc_color_depth == 8) + } else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) { + switch (hdmi_bus_fmt_color_depth( + hdmi->hdmi_data.enc_out_bus_format)) { + case 0: + case 8: remap_size = HDMI_VP_REMAP_YCC422_16bit; - else if (hdmi_data->enc_color_depth == 10) + break; + case 10: remap_size = HDMI_VP_REMAP_YCC422_20bit; - else if (hdmi_data->enc_color_depth == 12) + break; + case 12: remap_size = HDMI_VP_REMAP_YCC422_24bit; - else + break; + + default: return; + } output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_YCC422; } else { return; @@ -1138,28 +1252,35 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) /* Initialise info frame from DRM mode */ drm_hdmi_avi_infoframe_from_display_mode(&frame, mode); - if (hdmi->hdmi_data.enc_out_format == YCBCR444) + if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) frame.colorspace = HDMI_COLORSPACE_YUV444; - else if (hdmi->hdmi_data.enc_out_format == YCBCR422_8BITS) + else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) frame.colorspace = HDMI_COLORSPACE_YUV422; else frame.colorspace = HDMI_COLORSPACE_RGB; /* Set up colorimetry */ - if (hdmi->hdmi_data.enc_out_format == XVYCC444) { - frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; - if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601) - frame.extended_colorimetry = + switch (hdmi->hdmi_data.enc_out_encoding) { + case V4L2_YCBCR_ENC_601: + if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV601) + frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; + else + frame.colorimetry = HDMI_COLORIMETRY_ITU_601; + frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; - else /*hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_709*/ - frame.extended_colorimetry = + case V4L2_YCBCR_ENC_709: + if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV709) + frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; + else + frame.colorimetry = HDMI_COLORIMETRY_ITU_709; + frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_709; - } else if (hdmi->hdmi_data.enc_out_format != RGB) { - frame.colorimetry = hdmi->hdmi_data.colorimetry; - frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; - } else { /* Carries no data */ - frame.colorimetry = HDMI_COLORIMETRY_NONE; - frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; + break; + default: /* Carries no data */ + frame.colorimetry = HDMI_COLORIMETRY_ITU_601; + frame.extended_colorimetry = + HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; + break; } frame.scan_mode = HDMI_SCAN_MODE_NONE; @@ -1436,19 +1557,30 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) (hdmi->vic == 21) || (hdmi->vic == 22) || (hdmi->vic == 2) || (hdmi->vic == 3) || (hdmi->vic == 17) || (hdmi->vic == 18)) - hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_601; + hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_601; else - hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_709; + hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_709; hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = 0; hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0; - /* TODO: Get input format from IPU (via FB driver interface) */ - hdmi->hdmi_data.enc_in_format = RGB; + /* TOFIX: Get input format from plat data or fallback to RGB888 */ + if (hdmi->plat_data->input_bus_format >= 0) + hdmi->hdmi_data.enc_in_bus_format = + hdmi->plat_data->input_bus_format; + else + hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_RGB888_1X24; + + /* TOFIX: Get input encoding from plat data or fallback to none */ + if (hdmi->plat_data->input_bus_encoding >= 0) + hdmi->hdmi_data.enc_in_encoding = + hdmi->plat_data->input_bus_encoding; + else + hdmi->hdmi_data.enc_in_encoding = V4L2_YCBCR_ENC_DEFAULT; - hdmi->hdmi_data.enc_out_format = RGB; + /* TOFIX: Default to RGB888 output format */ + hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_RGB888_1X24; - hdmi->hdmi_data.enc_color_depth = 8; hdmi->hdmi_data.pix_repet_factor = 0; hdmi->hdmi_data.hdcp_enable = 0; hdmi->hdmi_data.video_mode.mdataenablepolarity = true; diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index bcceee8..c3b8da9 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -14,6 +14,67 @@ struct dw_hdmi; +/** + * DOC: Supported input formats and encodings + * + * Depending on the Hardware configuration of the Controller IP, it supports + * a subset of the following input formats and encodings on it's internal + * 48bit bus. + * + * +----------------------+---------------------------------+------------------------------+ + * + Format Name + Format Code + Encodings + + * +----------------------+---------------------------------+------------------------------+ + * + RGB 4:4:4 8bit + ``MEDIA_BUS_FMT_RGB888_1X24`` + ``V4L2_YCBCR_ENC_DEFAULT`` + + * +----------------------+---------------------------------+------------------------------+ + * + RGB 4:4:4 10bits + ``MEDIA_BUS_FMT_RGB101010_1X30``+ ``V4L2_YCBCR_ENC_DEFAULT`` + + * +----------------------+---------------------------------+------------------------------+ + * + RGB 4:4:4 12bits + ``MEDIA_BUS_FMT_RGB121212_1X36``+ ``V4L2_YCBCR_ENC_DEFAULT`` + + * +----------------------+---------------------------------+------------------------------+ + * + RGB 4:4:4 16bits + ``MEDIA_BUS_FMT_RGB161616_1X48``+ ``V4L2_YCBCR_ENC_DEFAULT`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:4:4 8bit + ``MEDIA_BUS_FMT_YUV8_1X24`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * + + + or ``V4L2_YCBCR_ENC_XV601`` + + * + + + or ``V4L2_YCBCR_ENC_XV709`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:4:4 10bits + ``MEDIA_BUS_FMT_YUV10_1X30`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * + + + or ``V4L2_YCBCR_ENC_XV601`` + + * + + + or ``V4L2_YCBCR_ENC_XV709`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:4:4 12bits + ``MEDIA_BUS_FMT_YUV12_1X36`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * + + + or ``V4L2_YCBCR_ENC_XV601`` + + * + + + or ``V4L2_YCBCR_ENC_XV709`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:4:4 16bits + ``MEDIA_BUS_FMT_YUV16_1X48`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * + + + or ``V4L2_YCBCR_ENC_XV601`` + + * + + + or ``V4L2_YCBCR_ENC_XV709`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:2:2 8bit + ``MEDIA_BUS_FMT_UYVY8_1X16`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:2:2 10bits + ``MEDIA_BUS_FMT_UYVY10_1X20`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:2:2 12bits + ``MEDIA_BUS_FMT_UYVY12_1X24`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:2:0 8bit + ``MEDIA_BUS_FMT_UYVY8_1_1X24`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:2:0 10bits + ``MEDIA_BUS_FMT_UYVY10_1_1X30`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:2:0 12bits + ``MEDIA_BUS_FMT_UYVY12_1_1X36`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * +----------------------+---------------------------------+------------------------------+ + * + YCbCr 4:2:0 16bits + ``MEDIA_BUS_FMT_UYVY16_1_1X48`` + ``V4L2_YCBCR_ENC_601`` + + * + + + or ``V4L2_YCBCR_ENC_709`` + + * +----------------------+---------------------------------+------------------------------+ + */ + enum { DW_HDMI_RES_8, DW_HDMI_RES_10, @@ -62,6 +123,8 @@ struct dw_hdmi_plat_data { struct regmap *regm; enum drm_mode_status (*mode_valid)(struct drm_connector *connector, struct drm_display_mode *mode); + unsigned long input_bus_format; + unsigned long input_bus_encoding; /* Vendor PHY support */ const struct dw_hdmi_phy_ops *phy_ops; -- 1.9.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings 2017-03-07 16:42 ` [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings Neil Armstrong @ 2017-03-07 17:35 ` Jose Abreu 2017-03-08 9:35 ` Neil Armstrong 2017-03-08 12:12 ` Neil Armstrong 0 siblings, 2 replies; 24+ messages in thread From: Jose Abreu @ 2017-03-07 17:35 UTC (permalink / raw) To: linus-amlogic Hi Neil, On 07-03-2017 16:42, Neil Armstrong wrote: > Some display pipelines can only provide non-RBG input pixels to the HDMI TX > Controller, this patch takes the pixel format from the plat_data if provided. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 322 +++++++++++++++++++++--------- > include/drm/bridge/dw_hdmi.h | 63 ++++++ > 2 files changed, 290 insertions(+), 95 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > index 1ed8bc1..348311c 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > @@ -30,17 +30,14 @@ > #include <drm/drm_encoder_slave.h> > #include <drm/bridge/dw_hdmi.h> > > +#include <uapi/linux/media-bus-format.h> > +#include <uapi/linux/videodev2.h> > + > #include "dw-hdmi.h" > #include "dw-hdmi-audio.h" > > #define HDMI_EDID_LEN 512 > > -#define RGB 0 > -#define YCBCR444 1 > -#define YCBCR422_16BITS 2 > -#define YCBCR422_8BITS 3 > -#define XVYCC444 4 > - > enum hdmi_datamap { > RGB444_8B = 0x01, > RGB444_10B = 0x03, > @@ -94,10 +91,10 @@ struct hdmi_vmode { > }; > > struct hdmi_data_info { > - unsigned int enc_in_format; > - unsigned int enc_out_format; > - unsigned int enc_color_depth; > - unsigned int colorimetry; > + unsigned int enc_in_bus_format; > + unsigned int enc_out_bus_format; > + unsigned int enc_in_encoding; > + unsigned int enc_out_encoding; > unsigned int pix_repet_factor; > unsigned int hdcp_enable; > struct hdmi_vmode video_mode; > @@ -557,6 +554,92 @@ void dw_hdmi_audio_disable(struct dw_hdmi *hdmi) > } > EXPORT_SYMBOL_GPL(dw_hdmi_audio_disable); > > +static bool hdmi_bus_fmt_is_rgb(unsigned int bus_format) > +{ > + switch (bus_format) { > + case MEDIA_BUS_FMT_RGB888_1X24: > + case MEDIA_BUS_FMT_RGB101010_1X30: > + case MEDIA_BUS_FMT_RGB121212_1X36: > + case MEDIA_BUS_FMT_RGB161616_1X48: > + return true; > + > + default: > + return false; > + } > +} > + > +static bool hdmi_bus_fmt_is_yuv444(unsigned int bus_format) > +{ > + switch (bus_format) { > + case MEDIA_BUS_FMT_YUV8_1X24: > + case MEDIA_BUS_FMT_YUV10_1X30: > + case MEDIA_BUS_FMT_YUV12_1X36: > + case MEDIA_BUS_FMT_YUV16_1X48: > + return true; > + > + default: > + return false; > + } > +} > + > +static bool hdmi_bus_fmt_is_yuv422(unsigned int bus_format) > +{ > + switch (bus_format) { > + case MEDIA_BUS_FMT_UYVY8_1X16: > + case MEDIA_BUS_FMT_UYVY10_1X20: > + case MEDIA_BUS_FMT_UYVY12_1X24: > + return true; > + > + default: > + return false; > + } > +} > + > +static bool hdmi_bus_fmt_is_yuv420(unsigned int bus_format) > +{ > + switch (bus_format) { > + case MEDIA_BUS_FMT_UYVY8_1_1X24: > + case MEDIA_BUS_FMT_UYVY10_1_1X30: > + case MEDIA_BUS_FMT_UYVY12_1_1X36: > + case MEDIA_BUS_FMT_UYVY16_1_1X48: > + return true; > + > + default: > + return false; > + } > +} > + > +static int hdmi_bus_fmt_color_depth(unsigned int bus_format) > +{ > + switch (bus_format) { > + case MEDIA_BUS_FMT_RGB888_1X24: > + case MEDIA_BUS_FMT_YUV8_1X24: > + case MEDIA_BUS_FMT_UYVY8_1X16: > + case MEDIA_BUS_FMT_UYVY8_1_1X24: > + return 8; > + > + case MEDIA_BUS_FMT_RGB101010_1X30: > + case MEDIA_BUS_FMT_YUV10_1X30: > + case MEDIA_BUS_FMT_UYVY10_1X20: > + case MEDIA_BUS_FMT_UYVY10_1_1X30: > + return 10; > + > + case MEDIA_BUS_FMT_RGB121212_1X36: > + case MEDIA_BUS_FMT_YUV12_1X36: > + case MEDIA_BUS_FMT_UYVY12_1X24: > + case MEDIA_BUS_FMT_UYVY12_1_1X36: > + return 12; > + > + case MEDIA_BUS_FMT_RGB161616_1X48: > + case MEDIA_BUS_FMT_YUV16_1X48: > + case MEDIA_BUS_FMT_UYVY16_1_1X48: > + return 16; > + > + default: > + return 0; Maybe fallback to 8bpp in case of error as this is the most common supported. > + } > +} > + > /* > * this submodule is responsible for the video data synchronization. > * for example, for RGB 4:4:4 input, the data map is defined as > @@ -569,37 +652,45 @@ static void hdmi_video_sample(struct dw_hdmi *hdmi) > int color_format = 0; > u8 val; > > - if (hdmi->hdmi_data.enc_in_format == RGB) { > - if (hdmi->hdmi_data.enc_color_depth == 8) > - color_format = 0x01; > - else if (hdmi->hdmi_data.enc_color_depth == 10) > - color_format = 0x03; > - else if (hdmi->hdmi_data.enc_color_depth == 12) > - color_format = 0x05; > - else if (hdmi->hdmi_data.enc_color_depth == 16) > - color_format = 0x07; > - else > - return; > - } else if (hdmi->hdmi_data.enc_in_format == YCBCR444) { > - if (hdmi->hdmi_data.enc_color_depth == 8) > - color_format = 0x09; > - else if (hdmi->hdmi_data.enc_color_depth == 10) > - color_format = 0x0B; > - else if (hdmi->hdmi_data.enc_color_depth == 12) > - color_format = 0x0D; > - else if (hdmi->hdmi_data.enc_color_depth == 16) > - color_format = 0x0F; > - else > - return; > - } else if (hdmi->hdmi_data.enc_in_format == YCBCR422_8BITS) { > - if (hdmi->hdmi_data.enc_color_depth == 8) > - color_format = 0x16; > - else if (hdmi->hdmi_data.enc_color_depth == 10) > - color_format = 0x14; > - else if (hdmi->hdmi_data.enc_color_depth == 12) > - color_format = 0x12; > - else > - return; > + switch (hdmi->hdmi_data.enc_in_bus_format) { > + case MEDIA_BUS_FMT_RGB888_1X24: > + color_format = 0x01; > + break; > + case MEDIA_BUS_FMT_RGB101010_1X30: > + color_format = 0x03; > + break; > + case MEDIA_BUS_FMT_RGB121212_1X36: > + color_format = 0x05; > + break; > + case MEDIA_BUS_FMT_RGB161616_1X48: > + color_format = 0x07; > + break; > + > + case MEDIA_BUS_FMT_YUV8_1X24: > + color_format = 0x09; > + break; > + case MEDIA_BUS_FMT_YUV10_1X30: > + color_format = 0x0B; > + break; > + case MEDIA_BUS_FMT_YUV12_1X36: > + color_format = 0x0D; > + break; > + case MEDIA_BUS_FMT_YUV16_1X48: > + color_format = 0x0F; > + break; You should add here the 4:2.0 formats. I mean, 4:2:0 8 bits is 0x09, 4:2:0 10 bits is 0x0B, 4:2:0 12 bits is 0x0D and 4:2:0 16 bits is 0x0F. Best regards, Jose Miguel Abreu > + > + case MEDIA_BUS_FMT_UYVY8_1X16: > + color_format = 0x16; > + break; > + case MEDIA_BUS_FMT_UYVY10_1X20: > + color_format = 0x14; > + break; > + case MEDIA_BUS_FMT_UYVY12_1X24: > + color_format = 0x12; > + break; > + > + default: > + return; > } > > val = HDMI_TX_INVID0_INTERNAL_DE_GENERATOR_DISABLE | > @@ -622,26 +713,30 @@ static void hdmi_video_sample(struct dw_hdmi *hdmi) > > static int is_color_space_conversion(struct dw_hdmi *hdmi) > { > - return hdmi->hdmi_data.enc_in_format != hdmi->hdmi_data.enc_out_format; > + return hdmi->hdmi_data.enc_in_bus_format != hdmi->hdmi_data.enc_out_bus_format; > } > > static int is_color_space_decimation(struct dw_hdmi *hdmi) > { > - if (hdmi->hdmi_data.enc_out_format != YCBCR422_8BITS) > + if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) > return 0; > - if (hdmi->hdmi_data.enc_in_format == RGB || > - hdmi->hdmi_data.enc_in_format == YCBCR444) > + > + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_in_bus_format) || > + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_in_bus_format)) > return 1; > + > return 0; > } > > static int is_color_space_interpolation(struct dw_hdmi *hdmi) > { > - if (hdmi->hdmi_data.enc_in_format != YCBCR422_8BITS) > + if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_in_bus_format)) > return 0; > - if (hdmi->hdmi_data.enc_out_format == RGB || > - hdmi->hdmi_data.enc_out_format == YCBCR444) > + > + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) || > + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) > return 1; > + > return 0; > } > > @@ -652,15 +747,16 @@ static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi) > u32 csc_scale = 1; > > if (is_color_space_conversion(hdmi)) { > - if (hdmi->hdmi_data.enc_out_format == RGB) { > - if (hdmi->hdmi_data.colorimetry == > - HDMI_COLORIMETRY_ITU_601) > + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) { > + if (hdmi->hdmi_data.enc_out_encoding == > + V4L2_YCBCR_ENC_601) > csc_coeff = &csc_coeff_rgb_out_eitu601; > else > csc_coeff = &csc_coeff_rgb_out_eitu709; > - } else if (hdmi->hdmi_data.enc_in_format == RGB) { > - if (hdmi->hdmi_data.colorimetry == > - HDMI_COLORIMETRY_ITU_601) > + } else if (hdmi_bus_fmt_is_rgb( > + hdmi->hdmi_data.enc_in_bus_format)) { > + if (hdmi->hdmi_data.enc_out_encoding == > + V4L2_YCBCR_ENC_601) > csc_coeff = &csc_coeff_rgb_in_eitu601; > else > csc_coeff = &csc_coeff_rgb_in_eitu709; > @@ -698,16 +794,23 @@ static void hdmi_video_csc(struct dw_hdmi *hdmi) > else if (is_color_space_decimation(hdmi)) > decimation = HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA3; > > - if (hdmi->hdmi_data.enc_color_depth == 8) > + switch (hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format)) { > + case 8: > color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_24BPP; > - else if (hdmi->hdmi_data.enc_color_depth == 10) > + break; > + case 10: > color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_30BPP; > - else if (hdmi->hdmi_data.enc_color_depth == 12) > + break; > + case 12: > color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_36BPP; > - else if (hdmi->hdmi_data.enc_color_depth == 16) > + break; > + case 16: > color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_48BPP; > - else > + break; > + > + default: > return; > + } > > /* Configure the CSC registers */ > hdmi_writeb(hdmi, interpolation | decimation, HDMI_CSC_CFG); > @@ -730,32 +833,43 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi) > struct hdmi_data_info *hdmi_data = &hdmi->hdmi_data; > u8 val, vp_conf; > > - if (hdmi_data->enc_out_format == RGB || > - hdmi_data->enc_out_format == YCBCR444) { > - if (!hdmi_data->enc_color_depth) { > - output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; > - } else if (hdmi_data->enc_color_depth == 8) { > + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) || > + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) { > + switch (hdmi_bus_fmt_color_depth( > + hdmi->hdmi_data.enc_out_bus_format)) { > + case 8: > color_depth = 4; > output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; > - } else if (hdmi_data->enc_color_depth == 10) { > + break; > + case 10: > color_depth = 5; > - } else if (hdmi_data->enc_color_depth == 12) { > + break; > + case 12: > color_depth = 6; > - } else if (hdmi_data->enc_color_depth == 16) { > + break; > + case 16: > color_depth = 7; > - } else { > - return; > + break; > + default: > + output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; > } > - } else if (hdmi_data->enc_out_format == YCBCR422_8BITS) { > - if (!hdmi_data->enc_color_depth || > - hdmi_data->enc_color_depth == 8) > + } else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) { > + switch (hdmi_bus_fmt_color_depth( > + hdmi->hdmi_data.enc_out_bus_format)) { > + case 0: > + case 8: > remap_size = HDMI_VP_REMAP_YCC422_16bit; > - else if (hdmi_data->enc_color_depth == 10) > + break; > + case 10: > remap_size = HDMI_VP_REMAP_YCC422_20bit; > - else if (hdmi_data->enc_color_depth == 12) > + break; > + case 12: > remap_size = HDMI_VP_REMAP_YCC422_24bit; > - else > + break; > + > + default: > return; > + } > output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_YCC422; > } else { > return; > @@ -1138,28 +1252,35 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) > /* Initialise info frame from DRM mode */ > drm_hdmi_avi_infoframe_from_display_mode(&frame, mode); > > - if (hdmi->hdmi_data.enc_out_format == YCBCR444) > + if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) > frame.colorspace = HDMI_COLORSPACE_YUV444; > - else if (hdmi->hdmi_data.enc_out_format == YCBCR422_8BITS) > + else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) > frame.colorspace = HDMI_COLORSPACE_YUV422; > else > frame.colorspace = HDMI_COLORSPACE_RGB; > > /* Set up colorimetry */ > - if (hdmi->hdmi_data.enc_out_format == XVYCC444) { > - frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; > - if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601) > - frame.extended_colorimetry = > + switch (hdmi->hdmi_data.enc_out_encoding) { > + case V4L2_YCBCR_ENC_601: > + if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV601) > + frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; > + else > + frame.colorimetry = HDMI_COLORIMETRY_ITU_601; > + frame.extended_colorimetry = > HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; > - else /*hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_709*/ > - frame.extended_colorimetry = > + case V4L2_YCBCR_ENC_709: > + if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV709) > + frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; > + else > + frame.colorimetry = HDMI_COLORIMETRY_ITU_709; > + frame.extended_colorimetry = > HDMI_EXTENDED_COLORIMETRY_XV_YCC_709; > - } else if (hdmi->hdmi_data.enc_out_format != RGB) { > - frame.colorimetry = hdmi->hdmi_data.colorimetry; > - frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; > - } else { /* Carries no data */ > - frame.colorimetry = HDMI_COLORIMETRY_NONE; > - frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; > + break; > + default: /* Carries no data */ > + frame.colorimetry = HDMI_COLORIMETRY_ITU_601; > + frame.extended_colorimetry = > + HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; > + break; > } > > frame.scan_mode = HDMI_SCAN_MODE_NONE; > @@ -1436,19 +1557,30 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) > (hdmi->vic == 21) || (hdmi->vic == 22) || > (hdmi->vic == 2) || (hdmi->vic == 3) || > (hdmi->vic == 17) || (hdmi->vic == 18)) > - hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_601; > + hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_601; > else > - hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_709; > + hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_709; > > hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = 0; > hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0; > > - /* TODO: Get input format from IPU (via FB driver interface) */ > - hdmi->hdmi_data.enc_in_format = RGB; > + /* TOFIX: Get input format from plat data or fallback to RGB888 */ > + if (hdmi->plat_data->input_bus_format >= 0) > + hdmi->hdmi_data.enc_in_bus_format = > + hdmi->plat_data->input_bus_format; > + else > + hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_RGB888_1X24; > + > + /* TOFIX: Get input encoding from plat data or fallback to none */ > + if (hdmi->plat_data->input_bus_encoding >= 0) > + hdmi->hdmi_data.enc_in_encoding = > + hdmi->plat_data->input_bus_encoding; > + else > + hdmi->hdmi_data.enc_in_encoding = V4L2_YCBCR_ENC_DEFAULT; > > - hdmi->hdmi_data.enc_out_format = RGB; > + /* TOFIX: Default to RGB888 output format */ > + hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_RGB888_1X24; > > - hdmi->hdmi_data.enc_color_depth = 8; > hdmi->hdmi_data.pix_repet_factor = 0; > hdmi->hdmi_data.hdcp_enable = 0; > hdmi->hdmi_data.video_mode.mdataenablepolarity = true; > diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h > index bcceee8..c3b8da9 100644 > --- a/include/drm/bridge/dw_hdmi.h > +++ b/include/drm/bridge/dw_hdmi.h > @@ -14,6 +14,67 @@ > > struct dw_hdmi; > > +/** > + * DOC: Supported input formats and encodings > + * > + * Depending on the Hardware configuration of the Controller IP, it supports > + * a subset of the following input formats and encodings on it's internal > + * 48bit bus. > + * > + * +----------------------+---------------------------------+------------------------------+ > + * + Format Name + Format Code + Encodings + > + * +----------------------+---------------------------------+------------------------------+ > + * + RGB 4:4:4 8bit + ``MEDIA_BUS_FMT_RGB888_1X24`` + ``V4L2_YCBCR_ENC_DEFAULT`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + RGB 4:4:4 10bits + ``MEDIA_BUS_FMT_RGB101010_1X30``+ ``V4L2_YCBCR_ENC_DEFAULT`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + RGB 4:4:4 12bits + ``MEDIA_BUS_FMT_RGB121212_1X36``+ ``V4L2_YCBCR_ENC_DEFAULT`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + RGB 4:4:4 16bits + ``MEDIA_BUS_FMT_RGB161616_1X48``+ ``V4L2_YCBCR_ENC_DEFAULT`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:4:4 8bit + ``MEDIA_BUS_FMT_YUV8_1X24`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * + + + or ``V4L2_YCBCR_ENC_XV601`` + > + * + + + or ``V4L2_YCBCR_ENC_XV709`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:4:4 10bits + ``MEDIA_BUS_FMT_YUV10_1X30`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * + + + or ``V4L2_YCBCR_ENC_XV601`` + > + * + + + or ``V4L2_YCBCR_ENC_XV709`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:4:4 12bits + ``MEDIA_BUS_FMT_YUV12_1X36`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * + + + or ``V4L2_YCBCR_ENC_XV601`` + > + * + + + or ``V4L2_YCBCR_ENC_XV709`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:4:4 16bits + ``MEDIA_BUS_FMT_YUV16_1X48`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * + + + or ``V4L2_YCBCR_ENC_XV601`` + > + * + + + or ``V4L2_YCBCR_ENC_XV709`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:2:2 8bit + ``MEDIA_BUS_FMT_UYVY8_1X16`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:2:2 10bits + ``MEDIA_BUS_FMT_UYVY10_1X20`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:2:2 12bits + ``MEDIA_BUS_FMT_UYVY12_1X24`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:2:0 8bit + ``MEDIA_BUS_FMT_UYVY8_1_1X24`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:2:0 10bits + ``MEDIA_BUS_FMT_UYVY10_1_1X30`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:2:0 12bits + ``MEDIA_BUS_FMT_UYVY12_1_1X36`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * +----------------------+---------------------------------+------------------------------+ > + * + YCbCr 4:2:0 16bits + ``MEDIA_BUS_FMT_UYVY16_1_1X48`` + ``V4L2_YCBCR_ENC_601`` + > + * + + + or ``V4L2_YCBCR_ENC_709`` + > + * +----------------------+---------------------------------+------------------------------+ > + */ > + > enum { > DW_HDMI_RES_8, > DW_HDMI_RES_10, > @@ -62,6 +123,8 @@ struct dw_hdmi_plat_data { > struct regmap *regm; > enum drm_mode_status (*mode_valid)(struct drm_connector *connector, > struct drm_display_mode *mode); > + unsigned long input_bus_format; > + unsigned long input_bus_encoding; > > /* Vendor PHY support */ > const struct dw_hdmi_phy_ops *phy_ops; ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings 2017-03-07 17:35 ` Jose Abreu @ 2017-03-08 9:35 ` Neil Armstrong 2017-03-08 12:12 ` Neil Armstrong 1 sibling, 0 replies; 24+ messages in thread From: Neil Armstrong @ 2017-03-08 9:35 UTC (permalink / raw) To: linus-amlogic On 03/07/2017 06:35 PM, Jose Abreu wrote: > Hi Neil, > > > On 07-03-2017 16:42, Neil Armstrong wrote: >> Some display pipelines can only provide non-RBG input pixels to the HDMI TX >> Controller, this patch takes the pixel format from the plat_data if provided. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 322 +++++++++++++++++++++--------- >> include/drm/bridge/dw_hdmi.h | 63 ++++++ >> 2 files changed, 290 insertions(+), 95 deletions(-) >> >> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c >> index 1ed8bc1..348311c 100644 >> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c >> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c >> @@ -30,17 +30,14 @@ >> #include <drm/drm_encoder_slave.h> >> #include <drm/bridge/dw_hdmi.h> >> >> +#include <uapi/linux/media-bus-format.h> >> +#include <uapi/linux/videodev2.h> >> + >> #include "dw-hdmi.h" >> #include "dw-hdmi-audio.h" >> >> #define HDMI_EDID_LEN 512 >> >> -#define RGB 0 >> -#define YCBCR444 1 >> -#define YCBCR422_16BITS 2 >> -#define YCBCR422_8BITS 3 >> -#define XVYCC444 4 >> - >> enum hdmi_datamap { >> RGB444_8B = 0x01, >> RGB444_10B = 0x03, >> @@ -94,10 +91,10 @@ struct hdmi_vmode { >> }; >> >> struct hdmi_data_info { >> - unsigned int enc_in_format; >> - unsigned int enc_out_format; >> - unsigned int enc_color_depth; >> - unsigned int colorimetry; >> + unsigned int enc_in_bus_format; >> + unsigned int enc_out_bus_format; >> + unsigned int enc_in_encoding; >> + unsigned int enc_out_encoding; >> unsigned int pix_repet_factor; >> unsigned int hdcp_enable; >> struct hdmi_vmode video_mode; >> @@ -557,6 +554,92 @@ void dw_hdmi_audio_disable(struct dw_hdmi *hdmi) >> } >> EXPORT_SYMBOL_GPL(dw_hdmi_audio_disable); >> >> +static bool hdmi_bus_fmt_is_rgb(unsigned int bus_format) >> +{ >> + switch (bus_format) { >> + case MEDIA_BUS_FMT_RGB888_1X24: >> + case MEDIA_BUS_FMT_RGB101010_1X30: >> + case MEDIA_BUS_FMT_RGB121212_1X36: >> + case MEDIA_BUS_FMT_RGB161616_1X48: >> + return true; >> + >> + default: >> + return false; >> + } >> +} >> + >> +static bool hdmi_bus_fmt_is_yuv444(unsigned int bus_format) >> +{ >> + switch (bus_format) { >> + case MEDIA_BUS_FMT_YUV8_1X24: >> + case MEDIA_BUS_FMT_YUV10_1X30: >> + case MEDIA_BUS_FMT_YUV12_1X36: >> + case MEDIA_BUS_FMT_YUV16_1X48: >> + return true; >> + >> + default: >> + return false; >> + } >> +} >> + >> +static bool hdmi_bus_fmt_is_yuv422(unsigned int bus_format) >> +{ >> + switch (bus_format) { >> + case MEDIA_BUS_FMT_UYVY8_1X16: >> + case MEDIA_BUS_FMT_UYVY10_1X20: >> + case MEDIA_BUS_FMT_UYVY12_1X24: >> + return true; >> + >> + default: >> + return false; >> + } >> +} >> + >> +static bool hdmi_bus_fmt_is_yuv420(unsigned int bus_format) >> +{ >> + switch (bus_format) { >> + case MEDIA_BUS_FMT_UYVY8_1_1X24: >> + case MEDIA_BUS_FMT_UYVY10_1_1X30: >> + case MEDIA_BUS_FMT_UYVY12_1_1X36: >> + case MEDIA_BUS_FMT_UYVY16_1_1X48: >> + return true; >> + >> + default: >> + return false; >> + } >> +} >> + >> +static int hdmi_bus_fmt_color_depth(unsigned int bus_format) >> +{ >> + switch (bus_format) { >> + case MEDIA_BUS_FMT_RGB888_1X24: >> + case MEDIA_BUS_FMT_YUV8_1X24: >> + case MEDIA_BUS_FMT_UYVY8_1X16: >> + case MEDIA_BUS_FMT_UYVY8_1_1X24: >> + return 8; >> + >> + case MEDIA_BUS_FMT_RGB101010_1X30: >> + case MEDIA_BUS_FMT_YUV10_1X30: >> + case MEDIA_BUS_FMT_UYVY10_1X20: >> + case MEDIA_BUS_FMT_UYVY10_1_1X30: >> + return 10; >> + >> + case MEDIA_BUS_FMT_RGB121212_1X36: >> + case MEDIA_BUS_FMT_YUV12_1X36: >> + case MEDIA_BUS_FMT_UYVY12_1X24: >> + case MEDIA_BUS_FMT_UYVY12_1_1X36: >> + return 12; >> + >> + case MEDIA_BUS_FMT_RGB161616_1X48: >> + case MEDIA_BUS_FMT_YUV16_1X48: >> + case MEDIA_BUS_FMT_UYVY16_1_1X48: >> + return 16; >> + >> + default: >> + return 0; > > Maybe fallback to 8bpp in case of error as this is the most > common supported. The "return 0" mimics when enc_color_depth was set to 0, and it has a meaning when used in other functions. To be honest, I'm not sure if these cases are legit. > >> + } >> +} >> + >> /* >> * this submodule is responsible for the video data synchronization. >> * for example, for RGB 4:4:4 input, the data map is defined as >> @@ -569,37 +652,45 @@ static void hdmi_video_sample(struct dw_hdmi *hdmi) >> int color_format = 0; >> u8 val; >> >> - if (hdmi->hdmi_data.enc_in_format == RGB) { >> - if (hdmi->hdmi_data.enc_color_depth == 8) >> - color_format = 0x01; >> - else if (hdmi->hdmi_data.enc_color_depth == 10) >> - color_format = 0x03; >> - else if (hdmi->hdmi_data.enc_color_depth == 12) >> - color_format = 0x05; >> - else if (hdmi->hdmi_data.enc_color_depth == 16) >> - color_format = 0x07; >> - else >> - return; >> - } else if (hdmi->hdmi_data.enc_in_format == YCBCR444) { >> - if (hdmi->hdmi_data.enc_color_depth == 8) >> - color_format = 0x09; >> - else if (hdmi->hdmi_data.enc_color_depth == 10) >> - color_format = 0x0B; >> - else if (hdmi->hdmi_data.enc_color_depth == 12) >> - color_format = 0x0D; >> - else if (hdmi->hdmi_data.enc_color_depth == 16) >> - color_format = 0x0F; >> - else >> - return; >> - } else if (hdmi->hdmi_data.enc_in_format == YCBCR422_8BITS) { >> - if (hdmi->hdmi_data.enc_color_depth == 8) >> - color_format = 0x16; >> - else if (hdmi->hdmi_data.enc_color_depth == 10) >> - color_format = 0x14; >> - else if (hdmi->hdmi_data.enc_color_depth == 12) >> - color_format = 0x12; >> - else >> - return; >> + switch (hdmi->hdmi_data.enc_in_bus_format) { >> + case MEDIA_BUS_FMT_RGB888_1X24: >> + color_format = 0x01; >> + break; >> + case MEDIA_BUS_FMT_RGB101010_1X30: >> + color_format = 0x03; >> + break; >> + case MEDIA_BUS_FMT_RGB121212_1X36: >> + color_format = 0x05; >> + break; >> + case MEDIA_BUS_FMT_RGB161616_1X48: >> + color_format = 0x07; >> + break; >> + >> + case MEDIA_BUS_FMT_YUV8_1X24: >> + color_format = 0x09; >> + break; >> + case MEDIA_BUS_FMT_YUV10_1X30: >> + color_format = 0x0B; >> + break; >> + case MEDIA_BUS_FMT_YUV12_1X36: >> + color_format = 0x0D; >> + break; >> + case MEDIA_BUS_FMT_YUV16_1X48: >> + color_format = 0x0F; >> + break; > > You should add here the 4:2.0 formats. I mean, 4:2:0 8 bits is > 0x09, 4:2:0 10 bits is 0x0B, 4:2:0 12 bits is 0x0D and 4:2:0 16 > bits is 0x0F. Thanks, it's added. > > Best regards, > Jose Miguel Abreu > >> + >> + case MEDIA_BUS_FMT_UYVY8_1X16: >> + color_format = 0x16; >> + break; >> + case MEDIA_BUS_FMT_UYVY10_1X20: >> + color_format = 0x14; >> + break; >> + case MEDIA_BUS_FMT_UYVY12_1X24: >> + color_format = 0x12; >> + break; >> + >> + default: >> + return; >> } >> >> val = HDMI_TX_INVID0_INTERNAL_DE_GENERATOR_DISABLE | >> @@ -622,26 +713,30 @@ static void hdmi_video_sample(struct dw_hdmi *hdmi) >> >> static int is_color_space_conversion(struct dw_hdmi *hdmi) >> { >> - return hdmi->hdmi_data.enc_in_format != hdmi->hdmi_data.enc_out_format; >> + return hdmi->hdmi_data.enc_in_bus_format != hdmi->hdmi_data.enc_out_bus_format; >> } >> >> static int is_color_space_decimation(struct dw_hdmi *hdmi) >> { >> - if (hdmi->hdmi_data.enc_out_format != YCBCR422_8BITS) >> + if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) >> return 0; >> - if (hdmi->hdmi_data.enc_in_format == RGB || >> - hdmi->hdmi_data.enc_in_format == YCBCR444) >> + >> + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_in_bus_format) || >> + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_in_bus_format)) >> return 1; >> + >> return 0; >> } >> >> static int is_color_space_interpolation(struct dw_hdmi *hdmi) >> { >> - if (hdmi->hdmi_data.enc_in_format != YCBCR422_8BITS) >> + if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_in_bus_format)) >> return 0; >> - if (hdmi->hdmi_data.enc_out_format == RGB || >> - hdmi->hdmi_data.enc_out_format == YCBCR444) >> + >> + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) || >> + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) >> return 1; >> + >> return 0; >> } >> >> @@ -652,15 +747,16 @@ static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi) >> u32 csc_scale = 1; >> >> if (is_color_space_conversion(hdmi)) { >> - if (hdmi->hdmi_data.enc_out_format == RGB) { >> - if (hdmi->hdmi_data.colorimetry == >> - HDMI_COLORIMETRY_ITU_601) >> + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) { >> + if (hdmi->hdmi_data.enc_out_encoding == >> + V4L2_YCBCR_ENC_601) >> csc_coeff = &csc_coeff_rgb_out_eitu601; >> else >> csc_coeff = &csc_coeff_rgb_out_eitu709; >> - } else if (hdmi->hdmi_data.enc_in_format == RGB) { >> - if (hdmi->hdmi_data.colorimetry == >> - HDMI_COLORIMETRY_ITU_601) >> + } else if (hdmi_bus_fmt_is_rgb( >> + hdmi->hdmi_data.enc_in_bus_format)) { >> + if (hdmi->hdmi_data.enc_out_encoding == >> + V4L2_YCBCR_ENC_601) >> csc_coeff = &csc_coeff_rgb_in_eitu601; >> else >> csc_coeff = &csc_coeff_rgb_in_eitu709; >> @@ -698,16 +794,23 @@ static void hdmi_video_csc(struct dw_hdmi *hdmi) >> else if (is_color_space_decimation(hdmi)) >> decimation = HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA3; >> >> - if (hdmi->hdmi_data.enc_color_depth == 8) >> + switch (hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format)) { >> + case 8: >> color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_24BPP; >> - else if (hdmi->hdmi_data.enc_color_depth == 10) >> + break; >> + case 10: >> color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_30BPP; >> - else if (hdmi->hdmi_data.enc_color_depth == 12) >> + break; >> + case 12: >> color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_36BPP; >> - else if (hdmi->hdmi_data.enc_color_depth == 16) >> + break; >> + case 16: >> color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_48BPP; >> - else >> + break; >> + >> + default: >> return; >> + } >> >> /* Configure the CSC registers */ >> hdmi_writeb(hdmi, interpolation | decimation, HDMI_CSC_CFG); >> @@ -730,32 +833,43 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi) >> struct hdmi_data_info *hdmi_data = &hdmi->hdmi_data; >> u8 val, vp_conf; >> >> - if (hdmi_data->enc_out_format == RGB || >> - hdmi_data->enc_out_format == YCBCR444) { >> - if (!hdmi_data->enc_color_depth) { >> - output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; >> - } else if (hdmi_data->enc_color_depth == 8) { >> + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) || >> + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) { >> + switch (hdmi_bus_fmt_color_depth( >> + hdmi->hdmi_data.enc_out_bus_format)) { >> + case 8: >> color_depth = 4; >> output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; >> - } else if (hdmi_data->enc_color_depth == 10) { >> + break; >> + case 10: >> color_depth = 5; >> - } else if (hdmi_data->enc_color_depth == 12) { >> + break; >> + case 12: >> color_depth = 6; >> - } else if (hdmi_data->enc_color_depth == 16) { >> + break; >> + case 16: >> color_depth = 7; >> - } else { >> - return; >> + break; >> + default: >> + output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; >> } >> - } else if (hdmi_data->enc_out_format == YCBCR422_8BITS) { >> - if (!hdmi_data->enc_color_depth || >> - hdmi_data->enc_color_depth == 8) >> + } else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) { >> + switch (hdmi_bus_fmt_color_depth( >> + hdmi->hdmi_data.enc_out_bus_format)) { >> + case 0: >> + case 8: >> remap_size = HDMI_VP_REMAP_YCC422_16bit; >> - else if (hdmi_data->enc_color_depth == 10) >> + break; >> + case 10: >> remap_size = HDMI_VP_REMAP_YCC422_20bit; >> - else if (hdmi_data->enc_color_depth == 12) >> + break; >> + case 12: >> remap_size = HDMI_VP_REMAP_YCC422_24bit; >> - else >> + break; >> + >> + default: >> return; >> + } >> output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_YCC422; >> } else { >> return; >> @@ -1138,28 +1252,35 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) >> /* Initialise info frame from DRM mode */ >> drm_hdmi_avi_infoframe_from_display_mode(&frame, mode); >> >> - if (hdmi->hdmi_data.enc_out_format == YCBCR444) >> + if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) >> frame.colorspace = HDMI_COLORSPACE_YUV444; >> - else if (hdmi->hdmi_data.enc_out_format == YCBCR422_8BITS) >> + else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) >> frame.colorspace = HDMI_COLORSPACE_YUV422; >> else >> frame.colorspace = HDMI_COLORSPACE_RGB; >> >> /* Set up colorimetry */ >> - if (hdmi->hdmi_data.enc_out_format == XVYCC444) { >> - frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; >> - if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601) >> - frame.extended_colorimetry = >> + switch (hdmi->hdmi_data.enc_out_encoding) { >> + case V4L2_YCBCR_ENC_601: >> + if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV601) >> + frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; >> + else >> + frame.colorimetry = HDMI_COLORIMETRY_ITU_601; >> + frame.extended_colorimetry = >> HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; >> - else /*hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_709*/ >> - frame.extended_colorimetry = >> + case V4L2_YCBCR_ENC_709: >> + if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV709) >> + frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; >> + else >> + frame.colorimetry = HDMI_COLORIMETRY_ITU_709; >> + frame.extended_colorimetry = >> HDMI_EXTENDED_COLORIMETRY_XV_YCC_709; >> - } else if (hdmi->hdmi_data.enc_out_format != RGB) { >> - frame.colorimetry = hdmi->hdmi_data.colorimetry; >> - frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; >> - } else { /* Carries no data */ >> - frame.colorimetry = HDMI_COLORIMETRY_NONE; >> - frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; >> + break; >> + default: /* Carries no data */ >> + frame.colorimetry = HDMI_COLORIMETRY_ITU_601; >> + frame.extended_colorimetry = >> + HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; >> + break; >> } >> >> frame.scan_mode = HDMI_SCAN_MODE_NONE; >> @@ -1436,19 +1557,30 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) >> (hdmi->vic == 21) || (hdmi->vic == 22) || >> (hdmi->vic == 2) || (hdmi->vic == 3) || >> (hdmi->vic == 17) || (hdmi->vic == 18)) >> - hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_601; >> + hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_601; >> else >> - hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_709; >> + hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_709; >> >> hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = 0; >> hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0; >> >> - /* TODO: Get input format from IPU (via FB driver interface) */ >> - hdmi->hdmi_data.enc_in_format = RGB; >> + /* TOFIX: Get input format from plat data or fallback to RGB888 */ >> + if (hdmi->plat_data->input_bus_format >= 0) >> + hdmi->hdmi_data.enc_in_bus_format = >> + hdmi->plat_data->input_bus_format; >> + else >> + hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_RGB888_1X24; >> + >> + /* TOFIX: Get input encoding from plat data or fallback to none */ >> + if (hdmi->plat_data->input_bus_encoding >= 0) >> + hdmi->hdmi_data.enc_in_encoding = >> + hdmi->plat_data->input_bus_encoding; >> + else >> + hdmi->hdmi_data.enc_in_encoding = V4L2_YCBCR_ENC_DEFAULT; >> >> - hdmi->hdmi_data.enc_out_format = RGB; >> + /* TOFIX: Default to RGB888 output format */ >> + hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_RGB888_1X24; >> >> - hdmi->hdmi_data.enc_color_depth = 8; >> hdmi->hdmi_data.pix_repet_factor = 0; >> hdmi->hdmi_data.hdcp_enable = 0; >> hdmi->hdmi_data.video_mode.mdataenablepolarity = true; >> diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h >> index bcceee8..c3b8da9 100644 >> --- a/include/drm/bridge/dw_hdmi.h >> +++ b/include/drm/bridge/dw_hdmi.h >> @@ -14,6 +14,67 @@ >> >> struct dw_hdmi; >> >> +/** >> + * DOC: Supported input formats and encodings >> + * >> + * Depending on the Hardware configuration of the Controller IP, it supports >> + * a subset of the following input formats and encodings on it's internal >> + * 48bit bus. >> + * >> + * +----------------------+---------------------------------+------------------------------+ >> + * + Format Name + Format Code + Encodings + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + RGB 4:4:4 8bit + ``MEDIA_BUS_FMT_RGB888_1X24`` + ``V4L2_YCBCR_ENC_DEFAULT`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + RGB 4:4:4 10bits + ``MEDIA_BUS_FMT_RGB101010_1X30``+ ``V4L2_YCBCR_ENC_DEFAULT`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + RGB 4:4:4 12bits + ``MEDIA_BUS_FMT_RGB121212_1X36``+ ``V4L2_YCBCR_ENC_DEFAULT`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + RGB 4:4:4 16bits + ``MEDIA_BUS_FMT_RGB161616_1X48``+ ``V4L2_YCBCR_ENC_DEFAULT`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:4:4 8bit + ``MEDIA_BUS_FMT_YUV8_1X24`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV601`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:4:4 10bits + ``MEDIA_BUS_FMT_YUV10_1X30`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV601`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:4:4 12bits + ``MEDIA_BUS_FMT_YUV12_1X36`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV601`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:4:4 16bits + ``MEDIA_BUS_FMT_YUV16_1X48`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV601`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:2 8bit + ``MEDIA_BUS_FMT_UYVY8_1X16`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:2 10bits + ``MEDIA_BUS_FMT_UYVY10_1X20`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:2 12bits + ``MEDIA_BUS_FMT_UYVY12_1X24`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:0 8bit + ``MEDIA_BUS_FMT_UYVY8_1_1X24`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:0 10bits + ``MEDIA_BUS_FMT_UYVY10_1_1X30`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:0 12bits + ``MEDIA_BUS_FMT_UYVY12_1_1X36`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:0 16bits + ``MEDIA_BUS_FMT_UYVY16_1_1X48`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + */ >> + >> enum { >> DW_HDMI_RES_8, >> DW_HDMI_RES_10, >> @@ -62,6 +123,8 @@ struct dw_hdmi_plat_data { >> struct regmap *regm; >> enum drm_mode_status (*mode_valid)(struct drm_connector *connector, >> struct drm_display_mode *mode); >> + unsigned long input_bus_format; >> + unsigned long input_bus_encoding; >> >> /* Vendor PHY support */ >> const struct dw_hdmi_phy_ops *phy_ops; > ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings 2017-03-07 17:35 ` Jose Abreu 2017-03-08 9:35 ` Neil Armstrong @ 2017-03-08 12:12 ` Neil Armstrong 2017-03-09 14:27 ` Jose Abreu 1 sibling, 1 reply; 24+ messages in thread From: Neil Armstrong @ 2017-03-08 12:12 UTC (permalink / raw) To: linus-amlogic On 03/07/2017 06:35 PM, Jose Abreu wrote: > Hi Neil, > > > On 07-03-2017 16:42, Neil Armstrong wrote: >> Some display pipelines can only provide non-RBG input pixels to the HDMI TX >> Controller, this patch takes the pixel format from the plat_data if provided. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 322 +++++++++++++++++++++--------- >> include/drm/bridge/dw_hdmi.h | 63 ++++++ >> 2 files changed, 290 insertions(+), 95 deletions(-) >> >> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c >> index 1ed8bc1..348311c 100644 >> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c >> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c >> @@ -30,17 +30,14 @@ >> #include <drm/drm_encoder_slave.h> >> #include <drm/bridge/dw_hdmi.h> >> >> +#include <uapi/linux/media-bus-format.h> >> +#include <uapi/linux/videodev2.h> >> + >> #include "dw-hdmi.h" >> #include "dw-hdmi-audio.h" >> >> #define HDMI_EDID_LEN 512 >> >> -#define RGB 0 >> -#define YCBCR444 1 >> -#define YCBCR422_16BITS 2 >> -#define YCBCR422_8BITS 3 >> -#define XVYCC444 4 >> - >> enum hdmi_datamap { >> RGB444_8B = 0x01, >> RGB444_10B = 0x03, >> @@ -94,10 +91,10 @@ struct hdmi_vmode { >> }; >> >> struct hdmi_data_info { >> - unsigned int enc_in_format; >> - unsigned int enc_out_format; >> - unsigned int enc_color_depth; >> - unsigned int colorimetry; >> + unsigned int enc_in_bus_format; >> + unsigned int enc_out_bus_format; >> + unsigned int enc_in_encoding; >> + unsigned int enc_out_encoding; >> unsigned int pix_repet_factor; >> unsigned int hdcp_enable; >> struct hdmi_vmode video_mode; >> @@ -557,6 +554,92 @@ void dw_hdmi_audio_disable(struct dw_hdmi *hdmi) >> } >> EXPORT_SYMBOL_GPL(dw_hdmi_audio_disable); >> >> +static bool hdmi_bus_fmt_is_rgb(unsigned int bus_format) >> +{ >> + switch (bus_format) { >> + case MEDIA_BUS_FMT_RGB888_1X24: >> + case MEDIA_BUS_FMT_RGB101010_1X30: >> + case MEDIA_BUS_FMT_RGB121212_1X36: >> + case MEDIA_BUS_FMT_RGB161616_1X48: >> + return true; >> + >> + default: >> + return false; >> + } >> +} >> + >> +static bool hdmi_bus_fmt_is_yuv444(unsigned int bus_format) >> +{ >> + switch (bus_format) { >> + case MEDIA_BUS_FMT_YUV8_1X24: >> + case MEDIA_BUS_FMT_YUV10_1X30: >> + case MEDIA_BUS_FMT_YUV12_1X36: >> + case MEDIA_BUS_FMT_YUV16_1X48: >> + return true; >> + >> + default: >> + return false; >> + } >> +} >> + >> +static bool hdmi_bus_fmt_is_yuv422(unsigned int bus_format) >> +{ >> + switch (bus_format) { >> + case MEDIA_BUS_FMT_UYVY8_1X16: >> + case MEDIA_BUS_FMT_UYVY10_1X20: >> + case MEDIA_BUS_FMT_UYVY12_1X24: >> + return true; >> + >> + default: >> + return false; >> + } >> +} >> + >> +static bool hdmi_bus_fmt_is_yuv420(unsigned int bus_format) >> +{ >> + switch (bus_format) { >> + case MEDIA_BUS_FMT_UYVY8_1_1X24: >> + case MEDIA_BUS_FMT_UYVY10_1_1X30: >> + case MEDIA_BUS_FMT_UYVY12_1_1X36: >> + case MEDIA_BUS_FMT_UYVY16_1_1X48: >> + return true; >> + >> + default: >> + return false; >> + } >> +} >> + >> +static int hdmi_bus_fmt_color_depth(unsigned int bus_format) >> +{ >> + switch (bus_format) { >> + case MEDIA_BUS_FMT_RGB888_1X24: >> + case MEDIA_BUS_FMT_YUV8_1X24: >> + case MEDIA_BUS_FMT_UYVY8_1X16: >> + case MEDIA_BUS_FMT_UYVY8_1_1X24: >> + return 8; >> + >> + case MEDIA_BUS_FMT_RGB101010_1X30: >> + case MEDIA_BUS_FMT_YUV10_1X30: >> + case MEDIA_BUS_FMT_UYVY10_1X20: >> + case MEDIA_BUS_FMT_UYVY10_1_1X30: >> + return 10; >> + >> + case MEDIA_BUS_FMT_RGB121212_1X36: >> + case MEDIA_BUS_FMT_YUV12_1X36: >> + case MEDIA_BUS_FMT_UYVY12_1X24: >> + case MEDIA_BUS_FMT_UYVY12_1_1X36: >> + return 12; >> + >> + case MEDIA_BUS_FMT_RGB161616_1X48: >> + case MEDIA_BUS_FMT_YUV16_1X48: >> + case MEDIA_BUS_FMT_UYVY16_1_1X48: >> + return 16; >> + >> + default: >> + return 0; > > Maybe fallback to 8bpp in case of error as this is the most > common supported. > >> + } >> +} >> + >> /* >> * this submodule is responsible for the video data synchronization. >> * for example, for RGB 4:4:4 input, the data map is defined as >> @@ -569,37 +652,45 @@ static void hdmi_video_sample(struct dw_hdmi *hdmi) >> int color_format = 0; >> u8 val; >> >> - if (hdmi->hdmi_data.enc_in_format == RGB) { >> - if (hdmi->hdmi_data.enc_color_depth == 8) >> - color_format = 0x01; >> - else if (hdmi->hdmi_data.enc_color_depth == 10) >> - color_format = 0x03; >> - else if (hdmi->hdmi_data.enc_color_depth == 12) >> - color_format = 0x05; >> - else if (hdmi->hdmi_data.enc_color_depth == 16) >> - color_format = 0x07; >> - else >> - return; >> - } else if (hdmi->hdmi_data.enc_in_format == YCBCR444) { >> - if (hdmi->hdmi_data.enc_color_depth == 8) >> - color_format = 0x09; >> - else if (hdmi->hdmi_data.enc_color_depth == 10) >> - color_format = 0x0B; >> - else if (hdmi->hdmi_data.enc_color_depth == 12) >> - color_format = 0x0D; >> - else if (hdmi->hdmi_data.enc_color_depth == 16) >> - color_format = 0x0F; >> - else >> - return; >> - } else if (hdmi->hdmi_data.enc_in_format == YCBCR422_8BITS) { >> - if (hdmi->hdmi_data.enc_color_depth == 8) >> - color_format = 0x16; >> - else if (hdmi->hdmi_data.enc_color_depth == 10) >> - color_format = 0x14; >> - else if (hdmi->hdmi_data.enc_color_depth == 12) >> - color_format = 0x12; >> - else >> - return; >> + switch (hdmi->hdmi_data.enc_in_bus_format) { >> + case MEDIA_BUS_FMT_RGB888_1X24: >> + color_format = 0x01; >> + break; >> + case MEDIA_BUS_FMT_RGB101010_1X30: >> + color_format = 0x03; >> + break; >> + case MEDIA_BUS_FMT_RGB121212_1X36: >> + color_format = 0x05; >> + break; >> + case MEDIA_BUS_FMT_RGB161616_1X48: >> + color_format = 0x07; >> + break; >> + >> + case MEDIA_BUS_FMT_YUV8_1X24: >> + color_format = 0x09; >> + break; >> + case MEDIA_BUS_FMT_YUV10_1X30: >> + color_format = 0x0B; >> + break; >> + case MEDIA_BUS_FMT_YUV12_1X36: >> + color_format = 0x0D; >> + break; >> + case MEDIA_BUS_FMT_YUV16_1X48: >> + color_format = 0x0F; >> + break; > > You should add here the 4:2.0 formats. I mean, 4:2:0 8 bits is > 0x09, 4:2:0 10 bits is 0x0B, 4:2:0 12 bits is 0x0D and 4:2:0 16 > bits is 0x0F. > > Best regards, > Jose Miguel Abreu > >> + >> + case MEDIA_BUS_FMT_UYVY8_1X16: >> + color_format = 0x16; >> + break; >> + case MEDIA_BUS_FMT_UYVY10_1X20: >> + color_format = 0x14; >> + break; >> + case MEDIA_BUS_FMT_UYVY12_1X24: >> + color_format = 0x12; >> + break; >> + >> + default: >> + return; >> } >> >> val = HDMI_TX_INVID0_INTERNAL_DE_GENERATOR_DISABLE | >> @@ -622,26 +713,30 @@ static void hdmi_video_sample(struct dw_hdmi *hdmi) >> >> static int is_color_space_conversion(struct dw_hdmi *hdmi) >> { >> - return hdmi->hdmi_data.enc_in_format != hdmi->hdmi_data.enc_out_format; >> + return hdmi->hdmi_data.enc_in_bus_format != hdmi->hdmi_data.enc_out_bus_format; >> } >> >> static int is_color_space_decimation(struct dw_hdmi *hdmi) >> { >> - if (hdmi->hdmi_data.enc_out_format != YCBCR422_8BITS) >> + if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) >> return 0; >> - if (hdmi->hdmi_data.enc_in_format == RGB || >> - hdmi->hdmi_data.enc_in_format == YCBCR444) >> + >> + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_in_bus_format) || >> + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_in_bus_format)) >> return 1; >> + >> return 0; >> } >> >> static int is_color_space_interpolation(struct dw_hdmi *hdmi) >> { >> - if (hdmi->hdmi_data.enc_in_format != YCBCR422_8BITS) >> + if (!hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_in_bus_format)) >> return 0; >> - if (hdmi->hdmi_data.enc_out_format == RGB || >> - hdmi->hdmi_data.enc_out_format == YCBCR444) >> + >> + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) || >> + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) >> return 1; >> + >> return 0; >> } >> >> @@ -652,15 +747,16 @@ static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi) >> u32 csc_scale = 1; >> >> if (is_color_space_conversion(hdmi)) { >> - if (hdmi->hdmi_data.enc_out_format == RGB) { >> - if (hdmi->hdmi_data.colorimetry == >> - HDMI_COLORIMETRY_ITU_601) >> + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) { >> + if (hdmi->hdmi_data.enc_out_encoding == >> + V4L2_YCBCR_ENC_601) >> csc_coeff = &csc_coeff_rgb_out_eitu601; >> else >> csc_coeff = &csc_coeff_rgb_out_eitu709; >> - } else if (hdmi->hdmi_data.enc_in_format == RGB) { >> - if (hdmi->hdmi_data.colorimetry == >> - HDMI_COLORIMETRY_ITU_601) >> + } else if (hdmi_bus_fmt_is_rgb( >> + hdmi->hdmi_data.enc_in_bus_format)) { >> + if (hdmi->hdmi_data.enc_out_encoding == >> + V4L2_YCBCR_ENC_601) >> csc_coeff = &csc_coeff_rgb_in_eitu601; >> else >> csc_coeff = &csc_coeff_rgb_in_eitu709; Hi Jose, It seems here that we only have the RGB444<->YUV444 8bit tables, from the Amlogic source I have the following for 10bit, 12bit and 16bit for itu601 : static const u16 csc_coeff_rgb_out_eitu601_10b[3][4] = { { 0x2000, 0x6926, 0x74fd, 0x043b }, { 0x2000, 0x2cdd, 0x0000, 0x7a65 }, { 0x2000, 0x0000, 0x38b4, 0x78ea } }; static const u16 csc_coeff_rgb_out_eitu601_12b_16b[3][4] = { { 0x2000, 0x6926, 0x74fd, 0x10ee }, { 0x2000, 0x2cdd, 0x0000, 0x6992 }, { 0x2000, 0x0000, 0x38b4, 0x63a6 } }; static const u16 csc_coeff_rgb_in_eitu601_10b[3][4] = { { 0x2591, 0x1322, 0x074b, 0x0000 }, { 0x6535, 0x2000, 0x7acc, 0x0800 }, { 0x6acd, 0x7534, 0x2000, 0x0800 } }; static const u16 csc_coeff_rgb_in_eitu601_12b_16b[3][4] = { { 0x2591, 0x1322, 0x074b, 0x0000 }, { 0x6535, 0x2000, 0x7acc, 0x2000 }, { 0x6acd, 0x7534, 0x2000, 0x2000 } }; But I miss the itu709 values. Could you confirm these values and maybe provide the itu709 values ? Thanks ! Neil >> @@ -698,16 +794,23 @@ static void hdmi_video_csc(struct dw_hdmi *hdmi) >> else if (is_color_space_decimation(hdmi)) >> decimation = HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA3; >> >> - if (hdmi->hdmi_data.enc_color_depth == 8) >> + switch (hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format)) { >> + case 8: >> color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_24BPP; >> - else if (hdmi->hdmi_data.enc_color_depth == 10) >> + break; >> + case 10: >> color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_30BPP; >> - else if (hdmi->hdmi_data.enc_color_depth == 12) >> + break; >> + case 12: >> color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_36BPP; >> - else if (hdmi->hdmi_data.enc_color_depth == 16) >> + break; >> + case 16: >> color_depth = HDMI_CSC_SCALE_CSC_COLORDE_PTH_48BPP; >> - else >> + break; >> + >> + default: >> return; >> + } >> >> /* Configure the CSC registers */ >> hdmi_writeb(hdmi, interpolation | decimation, HDMI_CSC_CFG); >> @@ -730,32 +833,43 @@ static void hdmi_video_packetize(struct dw_hdmi *hdmi) >> struct hdmi_data_info *hdmi_data = &hdmi->hdmi_data; >> u8 val, vp_conf; >> >> - if (hdmi_data->enc_out_format == RGB || >> - hdmi_data->enc_out_format == YCBCR444) { >> - if (!hdmi_data->enc_color_depth) { >> - output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; >> - } else if (hdmi_data->enc_color_depth == 8) { >> + if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) || >> + hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) { >> + switch (hdmi_bus_fmt_color_depth( >> + hdmi->hdmi_data.enc_out_bus_format)) { >> + case 8: >> color_depth = 4; >> output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; >> - } else if (hdmi_data->enc_color_depth == 10) { >> + break; >> + case 10: >> color_depth = 5; >> - } else if (hdmi_data->enc_color_depth == 12) { >> + break; >> + case 12: >> color_depth = 6; >> - } else if (hdmi_data->enc_color_depth == 16) { >> + break; >> + case 16: >> color_depth = 7; >> - } else { >> - return; >> + break; >> + default: >> + output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS; >> } >> - } else if (hdmi_data->enc_out_format == YCBCR422_8BITS) { >> - if (!hdmi_data->enc_color_depth || >> - hdmi_data->enc_color_depth == 8) >> + } else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) { >> + switch (hdmi_bus_fmt_color_depth( >> + hdmi->hdmi_data.enc_out_bus_format)) { >> + case 0: >> + case 8: >> remap_size = HDMI_VP_REMAP_YCC422_16bit; >> - else if (hdmi_data->enc_color_depth == 10) >> + break; >> + case 10: >> remap_size = HDMI_VP_REMAP_YCC422_20bit; >> - else if (hdmi_data->enc_color_depth == 12) >> + break; >> + case 12: >> remap_size = HDMI_VP_REMAP_YCC422_24bit; >> - else >> + break; >> + >> + default: >> return; >> + } >> output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_YCC422; >> } else { >> return; >> @@ -1138,28 +1252,35 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) >> /* Initialise info frame from DRM mode */ >> drm_hdmi_avi_infoframe_from_display_mode(&frame, mode); >> >> - if (hdmi->hdmi_data.enc_out_format == YCBCR444) >> + if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format)) >> frame.colorspace = HDMI_COLORSPACE_YUV444; >> - else if (hdmi->hdmi_data.enc_out_format == YCBCR422_8BITS) >> + else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format)) >> frame.colorspace = HDMI_COLORSPACE_YUV422; >> else >> frame.colorspace = HDMI_COLORSPACE_RGB; >> >> /* Set up colorimetry */ >> - if (hdmi->hdmi_data.enc_out_format == XVYCC444) { >> - frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; >> - if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601) >> - frame.extended_colorimetry = >> + switch (hdmi->hdmi_data.enc_out_encoding) { >> + case V4L2_YCBCR_ENC_601: >> + if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV601) >> + frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; >> + else >> + frame.colorimetry = HDMI_COLORIMETRY_ITU_601; >> + frame.extended_colorimetry = >> HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; >> - else /*hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_709*/ >> - frame.extended_colorimetry = >> + case V4L2_YCBCR_ENC_709: >> + if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV709) >> + frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; >> + else >> + frame.colorimetry = HDMI_COLORIMETRY_ITU_709; >> + frame.extended_colorimetry = >> HDMI_EXTENDED_COLORIMETRY_XV_YCC_709; >> - } else if (hdmi->hdmi_data.enc_out_format != RGB) { >> - frame.colorimetry = hdmi->hdmi_data.colorimetry; >> - frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; >> - } else { /* Carries no data */ >> - frame.colorimetry = HDMI_COLORIMETRY_NONE; >> - frame.extended_colorimetry = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; >> + break; >> + default: /* Carries no data */ >> + frame.colorimetry = HDMI_COLORIMETRY_ITU_601; >> + frame.extended_colorimetry = >> + HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; >> + break; >> } >> >> frame.scan_mode = HDMI_SCAN_MODE_NONE; >> @@ -1436,19 +1557,30 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) >> (hdmi->vic == 21) || (hdmi->vic == 22) || >> (hdmi->vic == 2) || (hdmi->vic == 3) || >> (hdmi->vic == 17) || (hdmi->vic == 18)) >> - hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_601; >> + hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_601; >> else >> - hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_709; >> + hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_709; >> >> hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = 0; >> hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0; >> >> - /* TODO: Get input format from IPU (via FB driver interface) */ >> - hdmi->hdmi_data.enc_in_format = RGB; >> + /* TOFIX: Get input format from plat data or fallback to RGB888 */ >> + if (hdmi->plat_data->input_bus_format >= 0) >> + hdmi->hdmi_data.enc_in_bus_format = >> + hdmi->plat_data->input_bus_format; >> + else >> + hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_RGB888_1X24; >> + >> + /* TOFIX: Get input encoding from plat data or fallback to none */ >> + if (hdmi->plat_data->input_bus_encoding >= 0) >> + hdmi->hdmi_data.enc_in_encoding = >> + hdmi->plat_data->input_bus_encoding; >> + else >> + hdmi->hdmi_data.enc_in_encoding = V4L2_YCBCR_ENC_DEFAULT; >> >> - hdmi->hdmi_data.enc_out_format = RGB; >> + /* TOFIX: Default to RGB888 output format */ >> + hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_RGB888_1X24; >> >> - hdmi->hdmi_data.enc_color_depth = 8; >> hdmi->hdmi_data.pix_repet_factor = 0; >> hdmi->hdmi_data.hdcp_enable = 0; >> hdmi->hdmi_data.video_mode.mdataenablepolarity = true; >> diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h >> index bcceee8..c3b8da9 100644 >> --- a/include/drm/bridge/dw_hdmi.h >> +++ b/include/drm/bridge/dw_hdmi.h >> @@ -14,6 +14,67 @@ >> >> struct dw_hdmi; >> >> +/** >> + * DOC: Supported input formats and encodings >> + * >> + * Depending on the Hardware configuration of the Controller IP, it supports >> + * a subset of the following input formats and encodings on it's internal >> + * 48bit bus. >> + * >> + * +----------------------+---------------------------------+------------------------------+ >> + * + Format Name + Format Code + Encodings + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + RGB 4:4:4 8bit + ``MEDIA_BUS_FMT_RGB888_1X24`` + ``V4L2_YCBCR_ENC_DEFAULT`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + RGB 4:4:4 10bits + ``MEDIA_BUS_FMT_RGB101010_1X30``+ ``V4L2_YCBCR_ENC_DEFAULT`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + RGB 4:4:4 12bits + ``MEDIA_BUS_FMT_RGB121212_1X36``+ ``V4L2_YCBCR_ENC_DEFAULT`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + RGB 4:4:4 16bits + ``MEDIA_BUS_FMT_RGB161616_1X48``+ ``V4L2_YCBCR_ENC_DEFAULT`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:4:4 8bit + ``MEDIA_BUS_FMT_YUV8_1X24`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV601`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:4:4 10bits + ``MEDIA_BUS_FMT_YUV10_1X30`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV601`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:4:4 12bits + ``MEDIA_BUS_FMT_YUV12_1X36`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV601`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:4:4 16bits + ``MEDIA_BUS_FMT_YUV16_1X48`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV601`` + >> + * + + + or ``V4L2_YCBCR_ENC_XV709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:2 8bit + ``MEDIA_BUS_FMT_UYVY8_1X16`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:2 10bits + ``MEDIA_BUS_FMT_UYVY10_1X20`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:2 12bits + ``MEDIA_BUS_FMT_UYVY12_1X24`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:0 8bit + ``MEDIA_BUS_FMT_UYVY8_1_1X24`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:0 10bits + ``MEDIA_BUS_FMT_UYVY10_1_1X30`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:0 12bits + ``MEDIA_BUS_FMT_UYVY12_1_1X36`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + * + YCbCr 4:2:0 16bits + ``MEDIA_BUS_FMT_UYVY16_1_1X48`` + ``V4L2_YCBCR_ENC_601`` + >> + * + + + or ``V4L2_YCBCR_ENC_709`` + >> + * +----------------------+---------------------------------+------------------------------+ >> + */ >> + >> enum { >> DW_HDMI_RES_8, >> DW_HDMI_RES_10, >> @@ -62,6 +123,8 @@ struct dw_hdmi_plat_data { >> struct regmap *regm; >> enum drm_mode_status (*mode_valid)(struct drm_connector *connector, >> struct drm_display_mode *mode); >> + unsigned long input_bus_format; >> + unsigned long input_bus_encoding; >> >> /* Vendor PHY support */ >> const struct dw_hdmi_phy_ops *phy_ops; > ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings 2017-03-08 12:12 ` Neil Armstrong @ 2017-03-09 14:27 ` Jose Abreu 2017-03-13 11:43 ` Jose Abreu 0 siblings, 1 reply; 24+ messages in thread From: Jose Abreu @ 2017-03-09 14:27 UTC (permalink / raw) To: linus-amlogic Hi Neil, On 08-03-2017 12:12, Neil Armstrong wrote: > > Hi Jose, > > It seems here that we only have the RGB444<->YUV444 8bit tables, from the Amlogic > source I have the following for 10bit, 12bit and 16bit for itu601 : > > static const u16 csc_coeff_rgb_out_eitu601_10b[3][4] = { > { 0x2000, 0x6926, 0x74fd, 0x043b }, > { 0x2000, 0x2cdd, 0x0000, 0x7a65 }, > { 0x2000, 0x0000, 0x38b4, 0x78ea } > }; > > static const u16 csc_coeff_rgb_out_eitu601_12b_16b[3][4] = { > { 0x2000, 0x6926, 0x74fd, 0x10ee }, > { 0x2000, 0x2cdd, 0x0000, 0x6992 }, > { 0x2000, 0x0000, 0x38b4, 0x63a6 } > }; These two do not match anything I have here. > > static const u16 csc_coeff_rgb_in_eitu601_10b[3][4] = { > { 0x2591, 0x1322, 0x074b, 0x0000 }, > { 0x6535, 0x2000, 0x7acc, 0x0800 }, > { 0x6acd, 0x7534, 0x2000, 0x0800 } > }; This is more or less correct, I have small offsets. Note that I even have offsets with the values that are in dw-hdmi driver, which can be caused because I'm seeing the latest document that contain these values. I guess they were updated. > > static const u16 csc_coeff_rgb_in_eitu601_12b_16b[3][4] = { > { 0x2591, 0x1322, 0x074b, 0x0000 }, > { 0x6535, 0x2000, 0x7acc, 0x2000 }, > { 0x6acd, 0x7534, 0x2000, 0x2000 } > }; The same for this. > > But I miss the itu709 values. > > Could you confirm these values and maybe provide the itu709 values ? I will have to check if I can provide you the values. I will get back to you. Best regards, Jose Miguel Abreu > > Thanks ! > Neil > ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings 2017-03-09 14:27 ` Jose Abreu @ 2017-03-13 11:43 ` Jose Abreu 2017-03-14 8:14 ` Neil Armstrong 0 siblings, 1 reply; 24+ messages in thread From: Jose Abreu @ 2017-03-13 11:43 UTC (permalink / raw) To: linus-amlogic Hi Neil, On 09-03-2017 14:27, Jose Abreu wrote: > Hi Neil, > > > On 08-03-2017 12:12, Neil Armstrong wrote: >> Hi Jose, >> >> It seems here that we only have the RGB444<->YUV444 8bit tables, from the Amlogic >> source I have the following for 10bit, 12bit and 16bit for itu601 : >> >> static const u16 csc_coeff_rgb_out_eitu601_10b[3][4] = { >> { 0x2000, 0x6926, 0x74fd, 0x043b }, >> { 0x2000, 0x2cdd, 0x0000, 0x7a65 }, >> { 0x2000, 0x0000, 0x38b4, 0x78ea } >> }; >> >> static const u16 csc_coeff_rgb_out_eitu601_12b_16b[3][4] = { >> { 0x2000, 0x6926, 0x74fd, 0x10ee }, >> { 0x2000, 0x2cdd, 0x0000, 0x6992 }, >> { 0x2000, 0x0000, 0x38b4, 0x63a6 } >> }; > These two do not match anything I have here. > >> static const u16 csc_coeff_rgb_in_eitu601_10b[3][4] = { >> { 0x2591, 0x1322, 0x074b, 0x0000 }, >> { 0x6535, 0x2000, 0x7acc, 0x0800 }, >> { 0x6acd, 0x7534, 0x2000, 0x0800 } >> }; > This is more or less correct, I have small offsets. Note that I > even have offsets with the values that are in dw-hdmi driver, > which can be caused because I'm seeing the latest document that > contain these values. I guess they were updated. > >> static const u16 csc_coeff_rgb_in_eitu601_12b_16b[3][4] = { >> { 0x2591, 0x1322, 0x074b, 0x0000 }, >> { 0x6535, 0x2000, 0x7acc, 0x2000 }, >> { 0x6acd, 0x7534, 0x2000, 0x2000 } >> }; > The same for this. > >> But I miss the itu709 values. >> >> Could you confirm these values and maybe provide the itu709 values ? > I will have to check if I can provide you the values. I will get > back to you. Sorry but looks like I won't be able to provide you the correct values :/ If you are working for a Synopsys customer you can contact our CAE (If so I can guide you to the correct CAE). Anyway, unless you can test the values you have I suggest you don't use them, they do not match what I have here and I can't test them because right now I don't have a setup (I'm assuming that your CSC block within the controller was not modified). Best regards, Jose Miguel Abreu ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings 2017-03-13 11:43 ` Jose Abreu @ 2017-03-14 8:14 ` Neil Armstrong 0 siblings, 0 replies; 24+ messages in thread From: Neil Armstrong @ 2017-03-14 8:14 UTC (permalink / raw) To: linus-amlogic On 03/13/2017 12:43 PM, Jose Abreu wrote: > Hi Neil, > > > On 09-03-2017 14:27, Jose Abreu wrote: >> Hi Neil, >> >> >> On 08-03-2017 12:12, Neil Armstrong wrote: >>> Hi Jose, >>> >>> It seems here that we only have the RGB444<->YUV444 8bit tables, from the Amlogic >>> source I have the following for 10bit, 12bit and 16bit for itu601 : >>> >>> static const u16 csc_coeff_rgb_out_eitu601_10b[3][4] = { >>> { 0x2000, 0x6926, 0x74fd, 0x043b }, >>> { 0x2000, 0x2cdd, 0x0000, 0x7a65 }, >>> { 0x2000, 0x0000, 0x38b4, 0x78ea } >>> }; >>> >>> static const u16 csc_coeff_rgb_out_eitu601_12b_16b[3][4] = { >>> { 0x2000, 0x6926, 0x74fd, 0x10ee }, >>> { 0x2000, 0x2cdd, 0x0000, 0x6992 }, >>> { 0x2000, 0x0000, 0x38b4, 0x63a6 } >>> }; >> These two do not match anything I have here. >> >>> static const u16 csc_coeff_rgb_in_eitu601_10b[3][4] = { >>> { 0x2591, 0x1322, 0x074b, 0x0000 }, >>> { 0x6535, 0x2000, 0x7acc, 0x0800 }, >>> { 0x6acd, 0x7534, 0x2000, 0x0800 } >>> }; >> This is more or less correct, I have small offsets. Note that I >> even have offsets with the values that are in dw-hdmi driver, >> which can be caused because I'm seeing the latest document that >> contain these values. I guess they were updated. >> >>> static const u16 csc_coeff_rgb_in_eitu601_12b_16b[3][4] = { >>> { 0x2591, 0x1322, 0x074b, 0x0000 }, >>> { 0x6535, 0x2000, 0x7acc, 0x2000 }, >>> { 0x6acd, 0x7534, 0x2000, 0x2000 } >>> }; >> The same for this. >> >>> But I miss the itu709 values. >>> >>> Could you confirm these values and maybe provide the itu709 values ? >> I will have to check if I can provide you the values. I will get >> back to you. > > Sorry but looks like I won't be able to provide you the correct > values :/ If you are working for a Synopsys customer you can > contact our CAE (If so I can guide you to the correct CAE). > > Anyway, unless you can test the values you have I suggest you > don't use them, they do not match what I have here and I can't > test them because right now I don't have a setup (I'm assuming > that your CSC block within the controller was not modified). > > Best regards, > Jose Miguel Abreu > Hi Jose, Thanks for your effort, I will postpone this fix and only add the tables needed by the Amlogic platform when needed. Thanks, Neil ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 5/6] drm: bridge: dw-hdmi: Add Documentation on supported input formats 2017-03-07 16:42 [PATCH v3 0/6] drm: bridge: dw-hdmi: Add support for Custom PHYs Neil Armstrong ` (3 preceding siblings ...) 2017-03-07 16:42 ` [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings Neil Armstrong @ 2017-03-07 16:42 ` Neil Armstrong 2017-03-16 16:43 ` Archit Taneja 2017-03-07 16:42 ` [PATCH v3 6/6] drm: bridge: dw-hdmi: Move HPD handling to PHY operations Neil Armstrong 5 siblings, 1 reply; 24+ messages in thread From: Neil Armstrong @ 2017-03-07 16:42 UTC (permalink / raw) To: linus-amlogic This patch adds a new DRM documentation entry and links to the input format table added in the dw_hdmi header. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- Documentation/gpu/dw-hdmi.rst | 15 +++++++++++++++ Documentation/gpu/index.rst | 1 + 2 files changed, 16 insertions(+) create mode 100644 Documentation/gpu/dw-hdmi.rst diff --git a/Documentation/gpu/dw-hdmi.rst b/Documentation/gpu/dw-hdmi.rst new file mode 100644 index 0000000..486faad --- /dev/null +++ b/Documentation/gpu/dw-hdmi.rst @@ -0,0 +1,15 @@ +======================================================= + drm/bridge/dw-hdmi Synopsys DesignWare HDMI Controller +======================================================= + +Synopsys DesignWare HDMI Controller +=================================== + +This section covers everything related to the Synopsys DesignWare HDMI +Controller implemented as a DRM bridge. + +Supported Input Formats and Encodings +------------------------------------- + +.. kernel-doc:: include/drm/bridge/dw_hdmi.h + :doc: Supported input formats and encodings diff --git a/Documentation/gpu/index.rst b/Documentation/gpu/index.rst index e998ee0..0725449 100644 --- a/Documentation/gpu/index.rst +++ b/Documentation/gpu/index.rst @@ -10,6 +10,7 @@ Linux GPU Driver Developer's Guide drm-kms drm-kms-helpers drm-uapi + dw-hdmi i915 tinydrm vc4 -- 1.9.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v3 5/6] drm: bridge: dw-hdmi: Add Documentation on supported input formats 2017-03-07 16:42 ` [PATCH v3 5/6] drm: bridge: dw-hdmi: Add Documentation on supported input formats Neil Armstrong @ 2017-03-16 16:43 ` Archit Taneja 0 siblings, 0 replies; 24+ messages in thread From: Archit Taneja @ 2017-03-16 16:43 UTC (permalink / raw) To: linus-amlogic On 3/7/2017 10:12 PM, Neil Armstrong wrote: > This patch adds a new DRM documentation entry and links to the input > format table added in the dw_hdmi header. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Documentation/gpu/dw-hdmi.rst | 15 +++++++++++++++ > Documentation/gpu/index.rst | 1 + Maybe we create a sub-directory for bridges here? Maybe a hierarchy similar to tinydrm's? Looks good otherwise. Archit > 2 files changed, 16 insertions(+) > create mode 100644 Documentation/gpu/dw-hdmi.rst > > diff --git a/Documentation/gpu/dw-hdmi.rst b/Documentation/gpu/dw-hdmi.rst > new file mode 100644 > index 0000000..486faad > --- /dev/null > +++ b/Documentation/gpu/dw-hdmi.rst > @@ -0,0 +1,15 @@ > +======================================================= > + drm/bridge/dw-hdmi Synopsys DesignWare HDMI Controller > +======================================================= > + > +Synopsys DesignWare HDMI Controller > +=================================== > + > +This section covers everything related to the Synopsys DesignWare HDMI > +Controller implemented as a DRM bridge. > + > +Supported Input Formats and Encodings > +------------------------------------- > + > +.. kernel-doc:: include/drm/bridge/dw_hdmi.h > + :doc: Supported input formats and encodings > diff --git a/Documentation/gpu/index.rst b/Documentation/gpu/index.rst > index e998ee0..0725449 100644 > --- a/Documentation/gpu/index.rst > +++ b/Documentation/gpu/index.rst > @@ -10,6 +10,7 @@ Linux GPU Driver Developer's Guide > drm-kms > drm-kms-helpers > drm-uapi > + dw-hdmi > i915 > tinydrm > vc4 > -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 6/6] drm: bridge: dw-hdmi: Move HPD handling to PHY operations 2017-03-07 16:42 [PATCH v3 0/6] drm: bridge: dw-hdmi: Add support for Custom PHYs Neil Armstrong ` (4 preceding siblings ...) 2017-03-07 16:42 ` [PATCH v3 5/6] drm: bridge: dw-hdmi: Add Documentation on supported input formats Neil Armstrong @ 2017-03-07 16:42 ` Neil Armstrong 2017-03-07 17:19 ` Jose Abreu 5 siblings, 1 reply; 24+ messages in thread From: Neil Armstrong @ 2017-03-07 16:42 UTC (permalink / raw) To: linus-amlogic The HDMI TX controller support HPD and RXSENSE signaling from the PHY via it's STAT0 PHY interface, but some vendor PHYs can manage these signals independently from the controller, thus these STAT0 handling should be moved to PHY specific operations and become optional. The existing STAT0 HPD and RXSENSE handling code is refactored into a supplementaty set of default PHY operations that are used automatically when the platform glue doesn't provide its own operations. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 135 ++++++++++++++++++------------ include/drm/bridge/dw_hdmi.h | 5 ++ 2 files changed, 86 insertions(+), 54 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 348311c..1c6cb46 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -1215,10 +1215,46 @@ static enum drm_connector_status dw_hdmi_phy_read_hpd(struct dw_hdmi *hdmi, connector_status_connected : connector_status_disconnected; } +static void dw_hdmi_phy_update_hpd(struct dw_hdmi *hdmi, void *data, + bool force, bool disabled, bool rxsense) +{ + u8 old_mask = hdmi->phy_mask; + + if (force || disabled || !rxsense) + hdmi->phy_mask |= HDMI_PHY_RX_SENSE; + else + hdmi->phy_mask &= ~HDMI_PHY_RX_SENSE; + + if (old_mask != hdmi->phy_mask) + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); +} + +static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi, void *data) +{ + /* + * Configure the PHY RX SENSE and HPD interrupts polarities and clear + * any pending interrupt. + */ + hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + + /* Enable cable hot plug irq. */ + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); + + /* Clear and unmute interrupts. */ + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), + HDMI_IH_MUTE_PHY_STAT0); +} + static const struct dw_hdmi_phy_ops dw_hdmi_synopsys_phy_ops = { .init = dw_hdmi_phy_init, .disable = dw_hdmi_phy_disable, .read_hpd = dw_hdmi_phy_read_hpd, + .update_hpd = dw_hdmi_phy_update_hpd, + .setup_hpd = dw_hdmi_phy_setup_hpd, }; /* ----------------------------------------------------------------------------- @@ -1742,35 +1778,10 @@ static void dw_hdmi_update_power(struct dw_hdmi *hdmi) */ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) { - u8 old_mask = hdmi->phy_mask; - - if (hdmi->force || hdmi->disabled || !hdmi->rxsense) - hdmi->phy_mask |= HDMI_PHY_RX_SENSE; - else - hdmi->phy_mask &= ~HDMI_PHY_RX_SENSE; - - if (old_mask != hdmi->phy_mask) - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); -} - -static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi) -{ - /* - * Configure the PHY RX SENSE and HPD interrupts polarities and clear - * any pending interrupt. - */ - hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - - /* Enable cable hot plug irq. */ - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); - - /* Clear and unmute interrupts. */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), - HDMI_IH_MUTE_PHY_STAT0); + if (hdmi->phy.ops->update_hpd) + hdmi->phy.ops->update_hpd(hdmi, hdmi->phy.data, + hdmi->force, hdmi->disabled, + hdmi->rxsense); } static enum drm_connector_status @@ -1962,6 +1973,41 @@ static irqreturn_t dw_hdmi_hardirq(int irq, void *dev_id) return ret; } +void __dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense) +{ + mutex_lock(&hdmi->mutex); + + if (!hdmi->disabled && !hdmi->force) { + /* + * If the RX sense status indicates we're disconnected, + * clear the software rxsense status. + */ + if (!rx_sense) + hdmi->rxsense = false; + + /* + * Only set the software rxsense status when both + * rxsense and hpd indicates we're connected. + * This avoids what seems to be bad behaviour in + * at least iMX6S versions of the phy. + */ + if (hpd) + hdmi->rxsense = true; + + dw_hdmi_update_power(hdmi); + dw_hdmi_update_phy_mask(hdmi); + } + mutex_unlock(&hdmi->mutex); +} + +void dw_hdmi_setup_rx_sense(struct device *dev, bool hpd, bool rx_sense) +{ + struct dw_hdmi *hdmi = dev_get_drvdata(dev); + + __dw_hdmi_setup_rx_sense(hdmi, hpd, rx_sense); +} +EXPORT_SYMBOL_GPL(dw_hdmi_setup_rx_sense); + static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) { struct dw_hdmi *hdmi = dev_id; @@ -1994,30 +2040,10 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) * ask the source to re-read the EDID. */ if (intr_stat & - (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_IH_PHY_STAT0_HPD)) { - mutex_lock(&hdmi->mutex); - if (!hdmi->disabled && !hdmi->force) { - /* - * If the RX sense status indicates we're disconnected, - * clear the software rxsense status. - */ - if (!(phy_stat & HDMI_PHY_RX_SENSE)) - hdmi->rxsense = false; - - /* - * Only set the software rxsense status when both - * rxsense and hpd indicates we're connected. - * This avoids what seems to be bad behaviour in - * at least iMX6S versions of the phy. - */ - if (phy_stat & HDMI_PHY_HPD) - hdmi->rxsense = true; - - dw_hdmi_update_power(hdmi); - dw_hdmi_update_phy_mask(hdmi); - } - mutex_unlock(&hdmi->mutex); - } + (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_IH_PHY_STAT0_HPD)) + __dw_hdmi_setup_rx_sense(hdmi, + phy_stat & HDMI_PHY_HPD, + phy_stat & HDMI_PHY_RX_SENSE); if (intr_stat & HDMI_IH_PHY_STAT0_HPD) { dev_dbg(hdmi->dev, "EVENT=%s\n", @@ -2291,7 +2317,8 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) #endif dw_hdmi_fb_registered(hdmi); - dw_hdmi_phy_setup_hpd(hdmi); + if (hdmi->phy.ops->setup_hpd) + hdmi->phy.ops->setup_hpd(hdmi, hdmi->phy.data); memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo.parent = dev; diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index c3b8da9..e332b8e 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -117,6 +117,9 @@ struct dw_hdmi_phy_ops { struct drm_display_mode *mode); void (*disable)(struct dw_hdmi *hdmi, void *data); enum drm_connector_status (*read_hpd)(struct dw_hdmi *hdmi, void *data); + void (*update_hpd)(struct dw_hdmi *hdmi, void *data, + bool force, bool disabled, bool rxsense); + void (*setup_hpd)(struct dw_hdmi *hdmi, void *data); }; struct dw_hdmi_plat_data { @@ -147,6 +150,8 @@ int dw_hdmi_probe(struct platform_device *pdev, int dw_hdmi_bind(struct platform_device *pdev, struct drm_encoder *encoder, const struct dw_hdmi_plat_data *plat_data); +void dw_hdmi_setup_rx_sense(struct device *dev, bool hpd, bool rx_sense); + void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate); void dw_hdmi_audio_enable(struct dw_hdmi *hdmi); void dw_hdmi_audio_disable(struct dw_hdmi *hdmi); -- 1.9.1 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v3 6/6] drm: bridge: dw-hdmi: Move HPD handling to PHY operations 2017-03-07 16:42 ` [PATCH v3 6/6] drm: bridge: dw-hdmi: Move HPD handling to PHY operations Neil Armstrong @ 2017-03-07 17:19 ` Jose Abreu 0 siblings, 0 replies; 24+ messages in thread From: Jose Abreu @ 2017-03-07 17:19 UTC (permalink / raw) To: linus-amlogic Hi Neil, On 07-03-2017 16:42, Neil Armstrong wrote: > The HDMI TX controller support HPD and RXSENSE signaling from the PHY > via it's STAT0 PHY interface, but some vendor PHYs can manage these > signals independently from the controller, thus these STAT0 handling > should be moved to PHY specific operations and become optional. > > The existing STAT0 HPD and RXSENSE handling code is refactored into > a supplementaty set of default PHY operations that are used automatically > when the platform glue doesn't provide its own operations. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Looks nice! Reviewed-by: Jose Abreu <joabreu@synopsys.com> Best regards, Jose Miguel Abreu > --- > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 135 ++++++++++++++++++------------ > include/drm/bridge/dw_hdmi.h | 5 ++ > 2 files changed, 86 insertions(+), 54 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > index 348311c..1c6cb46 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > @@ -1215,10 +1215,46 @@ static enum drm_connector_status dw_hdmi_phy_read_hpd(struct dw_hdmi *hdmi, > connector_status_connected : connector_status_disconnected; > } > > +static void dw_hdmi_phy_update_hpd(struct dw_hdmi *hdmi, void *data, > + bool force, bool disabled, bool rxsense) > +{ > + u8 old_mask = hdmi->phy_mask; > + > + if (force || disabled || !rxsense) > + hdmi->phy_mask |= HDMI_PHY_RX_SENSE; > + else > + hdmi->phy_mask &= ~HDMI_PHY_RX_SENSE; > + > + if (old_mask != hdmi->phy_mask) > + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); > +} > + > +static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi, void *data) > +{ > + /* > + * Configure the PHY RX SENSE and HPD interrupts polarities and clear > + * any pending interrupt. > + */ > + hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); > + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, > + HDMI_IH_PHY_STAT0); > + > + /* Enable cable hot plug irq. */ > + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); > + > + /* Clear and unmute interrupts. */ > + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, > + HDMI_IH_PHY_STAT0); > + hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), > + HDMI_IH_MUTE_PHY_STAT0); > +} > + > static const struct dw_hdmi_phy_ops dw_hdmi_synopsys_phy_ops = { > .init = dw_hdmi_phy_init, > .disable = dw_hdmi_phy_disable, > .read_hpd = dw_hdmi_phy_read_hpd, > + .update_hpd = dw_hdmi_phy_update_hpd, > + .setup_hpd = dw_hdmi_phy_setup_hpd, > }; > > /* ----------------------------------------------------------------------------- > @@ -1742,35 +1778,10 @@ static void dw_hdmi_update_power(struct dw_hdmi *hdmi) > */ > static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) > { > - u8 old_mask = hdmi->phy_mask; > - > - if (hdmi->force || hdmi->disabled || !hdmi->rxsense) > - hdmi->phy_mask |= HDMI_PHY_RX_SENSE; > - else > - hdmi->phy_mask &= ~HDMI_PHY_RX_SENSE; > - > - if (old_mask != hdmi->phy_mask) > - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); > -} > - > -static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi) > -{ > - /* > - * Configure the PHY RX SENSE and HPD interrupts polarities and clear > - * any pending interrupt. > - */ > - hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); > - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, > - HDMI_IH_PHY_STAT0); > - > - /* Enable cable hot plug irq. */ > - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); > - > - /* Clear and unmute interrupts. */ > - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, > - HDMI_IH_PHY_STAT0); > - hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), > - HDMI_IH_MUTE_PHY_STAT0); > + if (hdmi->phy.ops->update_hpd) > + hdmi->phy.ops->update_hpd(hdmi, hdmi->phy.data, > + hdmi->force, hdmi->disabled, > + hdmi->rxsense); > } > > static enum drm_connector_status > @@ -1962,6 +1973,41 @@ static irqreturn_t dw_hdmi_hardirq(int irq, void *dev_id) > return ret; > } > > +void __dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense) > +{ > + mutex_lock(&hdmi->mutex); > + > + if (!hdmi->disabled && !hdmi->force) { > + /* > + * If the RX sense status indicates we're disconnected, > + * clear the software rxsense status. > + */ > + if (!rx_sense) > + hdmi->rxsense = false; > + > + /* > + * Only set the software rxsense status when both > + * rxsense and hpd indicates we're connected. > + * This avoids what seems to be bad behaviour in > + * at least iMX6S versions of the phy. > + */ > + if (hpd) > + hdmi->rxsense = true; > + > + dw_hdmi_update_power(hdmi); > + dw_hdmi_update_phy_mask(hdmi); > + } > + mutex_unlock(&hdmi->mutex); > +} > + > +void dw_hdmi_setup_rx_sense(struct device *dev, bool hpd, bool rx_sense) > +{ > + struct dw_hdmi *hdmi = dev_get_drvdata(dev); > + > + __dw_hdmi_setup_rx_sense(hdmi, hpd, rx_sense); > +} > +EXPORT_SYMBOL_GPL(dw_hdmi_setup_rx_sense); > + > static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) > { > struct dw_hdmi *hdmi = dev_id; > @@ -1994,30 +2040,10 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) > * ask the source to re-read the EDID. > */ > if (intr_stat & > - (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_IH_PHY_STAT0_HPD)) { > - mutex_lock(&hdmi->mutex); > - if (!hdmi->disabled && !hdmi->force) { > - /* > - * If the RX sense status indicates we're disconnected, > - * clear the software rxsense status. > - */ > - if (!(phy_stat & HDMI_PHY_RX_SENSE)) > - hdmi->rxsense = false; > - > - /* > - * Only set the software rxsense status when both > - * rxsense and hpd indicates we're connected. > - * This avoids what seems to be bad behaviour in > - * at least iMX6S versions of the phy. > - */ > - if (phy_stat & HDMI_PHY_HPD) > - hdmi->rxsense = true; > - > - dw_hdmi_update_power(hdmi); > - dw_hdmi_update_phy_mask(hdmi); > - } > - mutex_unlock(&hdmi->mutex); > - } > + (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_IH_PHY_STAT0_HPD)) > + __dw_hdmi_setup_rx_sense(hdmi, > + phy_stat & HDMI_PHY_HPD, > + phy_stat & HDMI_PHY_RX_SENSE); > > if (intr_stat & HDMI_IH_PHY_STAT0_HPD) { > dev_dbg(hdmi->dev, "EVENT=%s\n", > @@ -2291,7 +2317,8 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) > #endif > > dw_hdmi_fb_registered(hdmi); > - dw_hdmi_phy_setup_hpd(hdmi); > + if (hdmi->phy.ops->setup_hpd) > + hdmi->phy.ops->setup_hpd(hdmi, hdmi->phy.data); > > memset(&pdevinfo, 0, sizeof(pdevinfo)); > pdevinfo.parent = dev; > diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h > index c3b8da9..e332b8e 100644 > --- a/include/drm/bridge/dw_hdmi.h > +++ b/include/drm/bridge/dw_hdmi.h > @@ -117,6 +117,9 @@ struct dw_hdmi_phy_ops { > struct drm_display_mode *mode); > void (*disable)(struct dw_hdmi *hdmi, void *data); > enum drm_connector_status (*read_hpd)(struct dw_hdmi *hdmi, void *data); > + void (*update_hpd)(struct dw_hdmi *hdmi, void *data, > + bool force, bool disabled, bool rxsense); > + void (*setup_hpd)(struct dw_hdmi *hdmi, void *data); > }; > > struct dw_hdmi_plat_data { > @@ -147,6 +150,8 @@ int dw_hdmi_probe(struct platform_device *pdev, > int dw_hdmi_bind(struct platform_device *pdev, struct drm_encoder *encoder, > const struct dw_hdmi_plat_data *plat_data); > > +void dw_hdmi_setup_rx_sense(struct device *dev, bool hpd, bool rx_sense); > + > void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate); > void dw_hdmi_audio_enable(struct dw_hdmi *hdmi); > void dw_hdmi_audio_disable(struct dw_hdmi *hdmi); ^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2017-03-20 15:35 UTC | newest] Thread overview: 24+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-03-07 16:42 [PATCH v3 0/6] drm: bridge: dw-hdmi: Add support for Custom PHYs Neil Armstrong 2017-03-07 16:42 ` [PATCH v3 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function Neil Armstrong 2017-03-07 17:12 ` Jose Abreu 2017-03-08 10:25 ` Neil Armstrong 2017-03-07 16:42 ` [PATCH v3 2/6] media: uapi: Add RGB and YUV bus formats for Synopsys HDMI TX Controller Neil Armstrong 2017-03-16 17:06 ` Archit Taneja 2017-03-17 16:10 ` Neil Armstrong 2017-03-20 15:35 ` Hans Verkuil 2017-03-07 16:42 ` [PATCH v3 3/6] documentation: media: Add documentation for new RGB and YUV bus formats Neil Armstrong 2017-03-16 17:01 ` Archit Taneja 2017-03-17 16:11 ` Neil Armstrong 2017-03-20 15:04 ` Hans Verkuil 2017-03-20 14:33 ` Hans Verkuil 2017-03-07 16:42 ` [PATCH v3 4/6] drm: bridge: dw-hdmi: Switch to V4L bus format and encodings Neil Armstrong 2017-03-07 17:35 ` Jose Abreu 2017-03-08 9:35 ` Neil Armstrong 2017-03-08 12:12 ` Neil Armstrong 2017-03-09 14:27 ` Jose Abreu 2017-03-13 11:43 ` Jose Abreu 2017-03-14 8:14 ` Neil Armstrong 2017-03-07 16:42 ` [PATCH v3 5/6] drm: bridge: dw-hdmi: Add Documentation on supported input formats Neil Armstrong 2017-03-16 16:43 ` Archit Taneja 2017-03-07 16:42 ` [PATCH v3 6/6] drm: bridge: dw-hdmi: Move HPD handling to PHY operations Neil Armstrong 2017-03-07 17:19 ` Jose Abreu
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).