drm/bridge: dw-hdmi: implement bus-format negotiation and YUV420 support
Subsystems (5)
v5 cover drm/bridge: dw-hdmi: implement bus-format negotiation and YUV420 support
Hi Philippe, Heiko, Maxime, Laurent,
A bad negociation was detected on platforms not implementing a bridge on the encoder side, which has been fixed in this version.
Could you check it doesn't break your platforms using dw-hdmi ? Especially patches 1-5.
Thanks,
Neil
This patchset is based on Boris's merged "drm: Add support for bus-format negotiation" patchset to implement full bus-format negotiation for DW-HDMI, including YUV420 support and 10/12/16bit YUV444, YUV422 and RGB. The Color Space Converter support is already implemented.
And the counterpart implementation in the Amlogic Meson VPU dw-hdmi glue :
- basic bus-format negotiation to select YUV444 bus-format as DW-HDMI input
- YUV420 support when HDMI2.0 YUV420 modeset
This is a follow-up from the previous attempts :
- "drm/meson: Add support for HDMI2.0 YUV420 4k60" at [2]
- "drm/meson: Add support for HDMI2.0 4k60" at [3]
Changes since v4 at [7]:
- Cleaned up patch 1
- Added comment on patch 2
- Added commit message on patch 3
- Fixed invalid negociation when encoder is not yet a bridge (seen on allwinner & rockchip platforms) on patch 4
- Fixed invalid defines, handled MEDIA_BUS_FMT_FIXED and cleaned negociation debug on patch 4
- Added tags on patch 5, 6
- Removed meson_venc_hdmi_encoder_get_out_bus_fmts on patch 7
- Add off-list r-b from Jernej
Changes since v3 at [6]:
- Added "Plug atomic state hooks to the default implementation" on drm/bridge: dw-hdmi
- Also added these atomic state hooks in meson-dw-hdmi in patch 7
- Rebased on latest drm-misc-next including patches 1-7 of [1]
Changes since RFC v2 at [5]:
- Added fixes from Jonas, who tested and integrated it for Rockchip SoCs
- Added support for 10/12/16bit tmds clock calculation
- Added support for max_bcp connector property
- Adapted to Boris's v4 patchset
- Fixed typos reported by boris
Changes since RFC v1 at [4]:
- Rewrote negociation using the v2 patchset, including full DW-HDMI fmt negociation
[2] https://patchwork.freedesktop.org/patch/msgid/[email protected]
[3] https://patchwork.freedesktop.org/patch/msgid/[email protected]
[4] https://patchwork.freedesktop.org/patch/msgid/[email protected]
[5] https://patchwork.freedesktop.org/patch/msgid/[email protected]
[6] https://patchwork.freedesktop.org/patch/msgid/[email protected]
[7] https://patchwork.freedesktop.org/patch/msgid/[email protected]
Jonas Karlman (2):
drm/bridge: dw-hdmi: set mtmdsclock for deep color drm/bridge: dw-hdmi: add max bpc connector property
Neil Armstrong (9):
drm/bridge: dw-hdmi: Plug atomic state hooks to the default
implementation
drm/bridge: synopsys: dw-hdmi: add bus format negociation drm/bridge: synopsys: dw-hdmi: allow ycbcr420 modes for >= 0x200a drm/meson: venc: make drm_display_mode const
drm/meson: meson_dw_hdmi: add bridge and switch to drm_bridge_funcs drm/meson: dw-hdmi: stop enforcing input_bus_format drm/meson: venc: add support for YUV420 setup
drm/meson: vclk: add support for YUV420 setup
drm/meson: Add YUV420 output support
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 319 +++++++++++++++++++++- drivers/gpu/drm/meson/meson_dw_hdmi.c | 180 +++++++++--- drivers/gpu/drm/meson/meson_vclk.c | 93 +++++-- drivers/gpu/drm/meson/meson_vclk.h | 7 +- drivers/gpu/drm/meson/meson_venc.c | 10 +- drivers/gpu/drm/meson/meson_venc.h | 4 +- drivers/gpu/drm/meson/meson_venc_cvbs.c | 6 +- include/drm/bridge/dw_hdmi.h | 1 + 8 files changed, 544 insertions(+), 76 deletions(-)
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 1/11 drm/bridge: dw-hdmi: set mtmdsclock for deep color
From: Jonas Karlman <[email protected]>
Configure the correct mtmdsclock for deep colors to prepare support for 10, 12 & 16bit output.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +20 -1
@@ -1814,13 +1814,32 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,int hblank, vblank, h_de_hs, v_de_vs, hsync_len, vsync_len;unsigned int vdisplay, hdisplay; - vmode->mtmdsclock = vmode->mpixelclock = mode->clock *1000 ; + vmode->mpixelclock = mode->clock *1000 ;dev_dbg (hdmi->dev,"final pixclk = %d\n" , vmode->mpixelclock); + vmode->mtmdsclock = vmode->mpixelclock; + +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 16 : + vmode->mtmdsclock = vmode->mpixelclock *2 ; +break ; +case 12 : + vmode->mtmdsclock = vmode->mpixelclock *3 /2 ; +break ; +case 10 : + vmode->mtmdsclock = vmode->mpixelclock *5 /4 ; +break ; + } + } +if (hdmi_bus_fmt_is_yuv420 (hdmi->hdmi_data.enc_out_bus_format)) vmode->mtmdsclock /=2 ; +dev_dbg (hdmi->dev,"final tmdsclock = %d\n" , vmode->mtmdsclock); +/* Set up HDMI_FC_INVIDCONF */ inv_val = (hdmi->hdmi_data.hdcp_enable || (dw_hdmi_support_scdc(hdmi) &&
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 2/11 drm/bridge: dw-hdmi: add max bpc connector property
In reply to Neil ArmstrongFrom: Jonas Karlman <[email protected]>
Add the max_bpc property to the dw-hdmi connector to prepare support for 10, 12 & 16bit output support.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +8 -0
@@ -2414,6 +2414,14 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge,DRM_MODE_CONNECTOR_HDMIA , hdmi->ddc); +/* +* drm_connector_attach_max_bpc_property() requires the +* connector to have a state. +*/ +drm_atomic_helper_connector_reset (connector); + +drm_connector_attach_max_bpc_property (connector,8 ,16 ); +if (hdmi->version >=0x200a && hdmi->plat_data->use_drm_infoframe)drm_object_attach_property (&connector->base, connector->dev->mode_config.hdr_output_metadata_property,0 );
Signature · 1 line
2.22.0
PATCH v5 3/11 drm/bridge: dw-hdmi: Plug atomic state hooks to the default implementation
In reply to Neil ArmstrongAdd atomic_duplicate_state/atomic_destroy_state/atomic_reset bridge funcs to allow setup of atomic bridge state.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +3 -0
@@ -2506,6 +2506,9 @@ static void dw_hdmi_bridge_enable(struct drm_bridge *bridge) }static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = { + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, .attach = dw_hdmi_bridge_attach, .detach = dw_hdmi_bridge_detach, .enable = dw_hdmi_bridge_enable,
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 4/11 drm/bridge: synopsys: dw-hdmi: add bus format negociation
In reply to Neil ArmstrongAdd the atomic_get_output_bus_fmts, atomic_get_input_bus_fmts to negociate the possible output and input formats for the current mode and monitor, and use the negotiated formats in a basic atomic_check callback.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 281 +++++++++++++++++++++- 1 file changed, 277 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +277 -4
@@ -2097,11 +2097,10 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) hdmi->hdmi_data.video_mode.mpixelrepetitionoutput =0 ; hdmi->hdmi_data.video_mode.mpixelrepetitioninput =0 ; -/* TOFIX: Get input format from plat data or fallback to RGB888 */ if (hdmi->plat_data->input_bus_format) hdmi->hdmi_data.enc_in_bus_format = hdmi->plat_data->input_bus_format; -else +else if (hdmi->hdmi_data.enc_in_bus_format ==MEDIA_BUS_FMT_FIXED ) hdmi->hdmi_data.enc_in_bus_format =MEDIA_BUS_FMT_RGB888_1X24 ;/* TOFIX: Get input encoding from plat data or fallback to none */
@@ -2111,8 +2110,8 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)else hdmi->hdmi_data.enc_in_encoding =V4L2_YCBCR_ENC_DEFAULT ; -/* TOFIX: Default to RGB888 output format */ - hdmi->hdmi_data.enc_out_bus_format =MEDIA_BUS_FMT_RGB888_1X24 ; +if (hdmi->hdmi_data.enc_out_bus_format ==MEDIA_BUS_FMT_FIXED ) + hdmi->hdmi_data.enc_out_bus_format =MEDIA_BUS_FMT_RGB888_1X24 ; hdmi->hdmi_data.pix_repet_factor =0 ; hdmi->hdmi_data.hdcp_enable =0 ;
@@ -2390,6 +2389,277 @@ static const struct drm_connector_helper_funcs dw_hdmi_connector_helper_funcs = .atomic_check = dw_hdmi_connector_atomic_check, }; +/* +* Possible output formats : +* - MEDIA_BUS_FMT_UYYVYY16_0_5X48, +* - MEDIA_BUS_FMT_UYYVYY12_0_5X36, +* - MEDIA_BUS_FMT_UYYVYY10_0_5X30, +* - MEDIA_BUS_FMT_UYYVYY8_0_5X24, +* - MEDIA_BUS_FMT_YUV16_1X48, +* - MEDIA_BUS_FMT_RGB161616_1X48, +* - MEDIA_BUS_FMT_UYVY12_1X24, +* - MEDIA_BUS_FMT_YUV12_1X36, +* - MEDIA_BUS_FMT_RGB121212_1X36, +* - MEDIA_BUS_FMT_UYVY10_1X20, +* - MEDIA_BUS_FMT_YUV10_1X30, +* - MEDIA_BUS_FMT_RGB101010_1X30, +* - MEDIA_BUS_FMT_UYVY8_1X16, +* - MEDIA_BUS_FMT_YUV8_1X24, +* - MEDIA_BUS_FMT_RGB888_1X24, +*/ + +/* Can return a maximum of 11 possible output formats for a mode/connector */ +#define MAX_OUTPUT_SEL_FORMATS 11 + +static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state, +unsigned int *num_output_fmts) +{ +struct drm_connector *conn = conn_state->connector; +struct drm_display_info *info = &conn->display_info; +struct drm_display_mode *mode = &crtc_state->mode; +u8 max_bpc = conn_state->max_requested_bpc; +bool is_hdmi2_sink = info->hdmi.scdc.supported || + (info->color_formats &DRM_COLOR_FORMAT_YCRCB420 ); +u32 *output_fmts; +unsigned int i =0 ; + + *num_output_fmts =0 ; + + output_fmts =kcalloc (MAX_OUTPUT_SEL_FORMATS ,sizeof (*output_fmts), +GFP_KERNEL ); +if (!output_fmts) +return NULL ; + +/* If dw-hdmi is the only bridge, avoid negociating with ourselves */ +if (list_is_singular (&bridge->encoder->bridge_chain)) { + *num_output_fmts =1 ; + output_fmts[0 ] =MEDIA_BUS_FMT_FIXED ; + +return output_fmts; + } + +/* +* If the current mode enforces 4:2:0, force the output but format +* to 4:2:0 and do not add the YUV422/444/RGB formats +*/ +if (conn->ycbcr_420_allowed && + (drm_mode_is_420_only (info, mode) || + (is_hdmi2_sink &&drm_mode_is_420_also (info, mode)))) { + +/* Order bus formats from 16bit to 8bit if supported */ +if (max_bpc >=16 && info->bpc ==16 && + (info->hdmi.y420_dc_modes &DRM_EDID_YCBCR420_DC_48 )) + output_fmts[i++] =MEDIA_BUS_FMT_UYYVYY16_0_5X48 ; + +if (max_bpc >=12 && info->bpc >=12 && + (info->hdmi.y420_dc_modes &DRM_EDID_YCBCR420_DC_36 )) + output_fmts[i++] =MEDIA_BUS_FMT_UYYVYY12_0_5X36 ; + +if (max_bpc >=10 && info->bpc >=10 && + (info->hdmi.y420_dc_modes &DRM_EDID_YCBCR420_DC_30 )) + output_fmts[i++] =MEDIA_BUS_FMT_UYYVYY10_0_5X30 ; + +/* Default 8bit fallback */ + output_fmts[i++] =MEDIA_BUS_FMT_UYYVYY8_0_5X24 ; + + *num_output_fmts = i; + +return output_fmts; + } + +/* +* Order bus formats from 16bit to 8bit and from YUV422 to RGB +* if supported. In any case the default RGB888 format is added +*/ + +if (max_bpc >=16 && info->bpc ==16 ) { +if (info->color_formats &DRM_COLOR_FORMAT_YCRCB444 ) + output_fmts[i++] =MEDIA_BUS_FMT_YUV16_1X48 ; + + output_fmts[i++] =MEDIA_BUS_FMT_RGB161616_1X48 ; + } + +if (max_bpc >=12 && info->bpc >=12 ) { +if (info->color_formats &DRM_COLOR_FORMAT_YCRCB422 ) + output_fmts[i++] =MEDIA_BUS_FMT_UYVY12_1X24 ; + +if (info->color_formats &DRM_COLOR_FORMAT_YCRCB444 ) + output_fmts[i++] =MEDIA_BUS_FMT_YUV12_1X36 ; + + output_fmts[i++] =MEDIA_BUS_FMT_RGB121212_1X36 ; + } + +if (max_bpc >=10 && info->bpc >=10 ) { +if (info->color_formats &DRM_COLOR_FORMAT_YCRCB422 ) + output_fmts[i++] =MEDIA_BUS_FMT_UYVY10_1X20 ; + +if (info->color_formats &DRM_COLOR_FORMAT_YCRCB444 ) + output_fmts[i++] =MEDIA_BUS_FMT_YUV10_1X30 ; + + output_fmts[i++] =MEDIA_BUS_FMT_RGB101010_1X30 ; + } + +if (info->color_formats &DRM_COLOR_FORMAT_YCRCB422 ) + output_fmts[i++] =MEDIA_BUS_FMT_UYVY8_1X16 ; + +if (info->color_formats &DRM_COLOR_FORMAT_YCRCB444 ) + output_fmts[i++] =MEDIA_BUS_FMT_YUV8_1X24 ; + +/* Default 8bit RGB fallback */ + output_fmts[i++] =MEDIA_BUS_FMT_RGB888_1X24 ; + + *num_output_fmts = i; + +return output_fmts; +} + +/* +* Possible input formats : +* - MEDIA_BUS_FMT_RGB888_1X24 +* - MEDIA_BUS_FMT_YUV8_1X24 +* - MEDIA_BUS_FMT_UYVY8_1X16 +* - MEDIA_BUS_FMT_UYYVYY8_0_5X24 +* - MEDIA_BUS_FMT_RGB101010_1X30 +* - MEDIA_BUS_FMT_YUV10_1X30 +* - MEDIA_BUS_FMT_UYVY10_1X20 +* - MEDIA_BUS_FMT_UYYVYY10_0_5X30 +* - MEDIA_BUS_FMT_RGB121212_1X36 +* - MEDIA_BUS_FMT_YUV12_1X36 +* - MEDIA_BUS_FMT_UYVY12_1X24 +* - MEDIA_BUS_FMT_UYYVYY12_0_5X36 +* - MEDIA_BUS_FMT_RGB161616_1X48 +* - MEDIA_BUS_FMT_YUV16_1X48 +* - MEDIA_BUS_FMT_UYYVYY16_0_5X48 +*/ + +/* Can return a maximum of 3 possible input formats for an output format */ +#define MAX_INPUT_SEL_FORMATS 3 + +static u32 *dw_hdmi_bridge_atomic_get_input_bus_fmts (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state, +u32 output_fmt, +unsigned int *num_input_fmts) +{ +u32 *input_fmts; +unsigned int i =0 ; + + *num_input_fmts =0 ; + + input_fmts =kcalloc (MAX_INPUT_SEL_FORMATS ,sizeof (*input_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + +switch (output_fmt) { +/* If MEDIA_BUS_FMT_FIXED is tested, return default bus format */ +case MEDIA_BUS_FMT_FIXED : + input_fmts[i++] =MEDIA_BUS_FMT_RGB888_1X24 ; +break ; +/* 8bit */ +case MEDIA_BUS_FMT_RGB888_1X24 : + input_fmts[i++] =MEDIA_BUS_FMT_RGB888_1X24 ; + input_fmts[i++] =MEDIA_BUS_FMT_YUV8_1X24 ; + input_fmts[i++] =MEDIA_BUS_FMT_UYVY8_1X16 ; +break ; +case MEDIA_BUS_FMT_YUV8_1X24 : + input_fmts[i++] =MEDIA_BUS_FMT_YUV8_1X24 ; + input_fmts[i++] =MEDIA_BUS_FMT_UYVY8_1X16 ; + input_fmts[i++] =MEDIA_BUS_FMT_RGB888_1X24 ; +break ; +case MEDIA_BUS_FMT_UYVY8_1X16 : + input_fmts[i++] =MEDIA_BUS_FMT_UYVY8_1X16 ; + input_fmts[i++] =MEDIA_BUS_FMT_YUV8_1X24 ; + input_fmts[i++] =MEDIA_BUS_FMT_RGB888_1X24 ; +break ; + +/* 10bit */ +case MEDIA_BUS_FMT_RGB101010_1X30 : + input_fmts[i++] =MEDIA_BUS_FMT_RGB101010_1X30 ; + input_fmts[i++] =MEDIA_BUS_FMT_YUV10_1X30 ; + input_fmts[i++] =MEDIA_BUS_FMT_UYVY10_1X20 ; +break ; +case MEDIA_BUS_FMT_YUV10_1X30 : + input_fmts[i++] =MEDIA_BUS_FMT_YUV10_1X30 ; + input_fmts[i++] =MEDIA_BUS_FMT_UYVY10_1X20 ; + input_fmts[i++] =MEDIA_BUS_FMT_RGB101010_1X30 ; +break ; +case MEDIA_BUS_FMT_UYVY10_1X20 : + input_fmts[i++] =MEDIA_BUS_FMT_UYVY10_1X20 ; + input_fmts[i++] =MEDIA_BUS_FMT_YUV10_1X30 ; + input_fmts[i++] =MEDIA_BUS_FMT_RGB101010_1X30 ; +break ; + +/* 12bit */ +case MEDIA_BUS_FMT_RGB121212_1X36 : + input_fmts[i++] =MEDIA_BUS_FMT_RGB121212_1X36 ; + input_fmts[i++] =MEDIA_BUS_FMT_YUV12_1X36 ; + input_fmts[i++] =MEDIA_BUS_FMT_UYVY12_1X24 ; +break ; +case MEDIA_BUS_FMT_YUV12_1X36 : + input_fmts[i++] =MEDIA_BUS_FMT_YUV12_1X36 ; + input_fmts[i++] =MEDIA_BUS_FMT_UYVY12_1X24 ; + input_fmts[i++] =MEDIA_BUS_FMT_RGB121212_1X36 ; +break ; +case MEDIA_BUS_FMT_UYVY12_1X24 : + input_fmts[i++] =MEDIA_BUS_FMT_UYVY12_1X24 ; + input_fmts[i++] =MEDIA_BUS_FMT_YUV12_1X36 ; + input_fmts[i++] =MEDIA_BUS_FMT_RGB121212_1X36 ; +break ; + +/* 16bit */ +case MEDIA_BUS_FMT_RGB161616_1X48 : + input_fmts[i++] =MEDIA_BUS_FMT_RGB161616_1X48 ; + input_fmts[i++] =MEDIA_BUS_FMT_YUV16_1X48 ; +break ; +case MEDIA_BUS_FMT_YUV16_1X48 : + input_fmts[i++] =MEDIA_BUS_FMT_YUV16_1X48 ; + input_fmts[i++] =MEDIA_BUS_FMT_RGB161616_1X48 ; +break ; + +/*YUV 4:2:0 */ +case MEDIA_BUS_FMT_UYYVYY8_0_5X24 : +case MEDIA_BUS_FMT_UYYVYY10_0_5X30 : +case MEDIA_BUS_FMT_UYYVYY12_0_5X36 : +case MEDIA_BUS_FMT_UYYVYY16_0_5X48 : + input_fmts[i++] = output_fmt; +break ; + } + + *num_input_fmts = i; + +if (*num_input_fmts ==0 ) { +kfree (input_fmts); + input_fmts =NULL ; + } + +return input_fmts; +} + +static int dw_hdmi_bridge_atomic_check (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state) +{ +struct dw_hdmi *hdmi = bridge->driver_private; + + hdmi->hdmi_data.enc_out_bus_format = + bridge_state->output_bus_cfg.format; + + hdmi->hdmi_data.enc_in_bus_format = + bridge_state->input_bus_cfg.format; + +dev_dbg (hdmi->dev,"input format 0x%04x, output format 0x%04x\n" , + bridge_state->input_bus_cfg.format, + bridge_state->output_bus_cfg.format); + +return 0 ; +} +static int dw_hdmi_bridge_attach (struct drm_bridge *bridge,enum drm_bridge_attach_flags flags) {
@@ -2511,6 +2781,9 @@ static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = { .atomic_reset = drm_atomic_helper_bridge_reset, .attach = dw_hdmi_bridge_attach, .detach = dw_hdmi_bridge_detach, + .atomic_check = dw_hdmi_bridge_atomic_check, + .atomic_get_output_bus_fmts = dw_hdmi_bridge_atomic_get_output_bus_fmts, + .atomic_get_input_bus_fmts = dw_hdmi_bridge_atomic_get_input_bus_fmts, .enable = dw_hdmi_bridge_enable, .disable = dw_hdmi_bridge_disable, .mode_set = dw_hdmi_bridge_mode_set,
Signature · 1 line
2.22.0
PATCH v5 5/11 drm/bridge: synopsys: dw-hdmi: allow ycbcr420 modes for >= 0x200a
In reply to Neil ArmstrongNow the DW-HDMI Controller supports the HDMI2.0 modes, enable support for these modes in the connector if the platform supports them. We limit these modes to DW-HDMI IP version >= 0x200a which are designed to support HDMI2.0 display modes.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 ++++++ include/drm/bridge/dw_hdmi.h | 1 + 2 files changed, 7 insertions(+)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +6 -0
@@ -3252,6 +3252,12 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi->bridge.of_node = pdev->dev.of_node;#endif +if (hdmi->version >=0x200a ) + hdmi->connector.ycbcr_420_allowed = + hdmi->plat_data->ycbcr_420_allowed; +else + hdmi->connector.ycbcr_420_allowed = false; +memset (&pdevinfo,0 ,sizeof (pdevinfo)); pdevinfo.parent = dev; pdevinfo.id =PLATFORM_DEVID_AUTO ;
include/drm/bridge/dw_hdmi.h +1 -0
@@ -129,6 +129,7 @@ struct dw_hdmi_plat_data {unsigned long input_bus_format;unsigned long input_bus_encoding;bool use_drm_infoframe; +bool ycbcr_420_allowed;/* Vendor PHY support */ const struct dw_hdmi_phy_ops *phy_ops;
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 6/11 drm/meson: venc: make drm_display_mode const
In reply to Neil ArmstrongBefore switching to bridge funcs, make sure drm_display_mode is passed as const to the venc functions.
--- drivers/gpu/drm/meson/meson_venc.c | 2 +- drivers/gpu/drm/meson/meson_venc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/meson/meson_venc.c +1 -1
@@ -946,7 +946,7 @@ bool meson_venc_hdmi_venc_repeat(int vic)EXPORT_SYMBOL_GPL (meson_venc_hdmi_venc_repeat);void meson_venc_hdmi_mode_set (struct meson_drm *priv,int vic, -struct drm_display_mode *mode) +const struct drm_display_mode *mode) {union meson_hdmi_venc_mode *vmode =NULL ;union meson_hdmi_venc_mode vmode_dmt;
drivers/gpu/drm/meson/meson_venc.h +1 -1
@@ -60,7 +60,7 @@ extern struct meson_cvbs_enci_mode meson_cvbs_enci_ntsc;void meson_venci_cvbs_mode_set (struct meson_drm *priv,struct meson_cvbs_enci_mode *mode);void meson_venc_hdmi_mode_set (struct meson_drm *priv,int vic, -struct drm_display_mode *mode); +const struct drm_display_mode *mode);unsigned int meson_venci_get_field (struct meson_drm *priv);void meson_venc_enable_vsync (struct meson_drm *priv);
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 7/11 drm/meson: meson_dw_hdmi: add bridge and switch to drm_bridge_funcs
In reply to Neil ArmstrongSwitch the dw-hdmi driver to drm_bridge_funcs by implementing a new local bridge, connecting it to the dw-hdmi bridge, then implement the atomic_get_input_bus_fmts/atomic_get_output_bus_fmts.
--- drivers/gpu/drm/meson/meson_dw_hdmi.c | 85 ++++++++++++++++++++------- 1 file changed, 65 insertions(+), 20 deletions(-)
drivers/gpu/drm/meson/meson_dw_hdmi.c +65 -20
@@ -16,6 +16,7 @@#include <drm/bridge/dw_hdmi.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> #include <drm/drm_device.h> #include <drm/drm_edid.h> #include <drm/drm_probe_helper.h>
@@ -135,6 +136,7 @@ struct meson_dw_hdmi_data {struct meson_dw_hdmi {struct drm_encoder encoder; +struct drm_bridge bridge;struct dw_hdmi_plat_data dw_plat_data;struct meson_drm *priv;struct device *dev;
@@ -151,6 +153,8 @@ struct meson_dw_hdmi { };#define encoder_to_meson_dw_hdmi (x) \ container_of(x, struct meson_dw_hdmi, encoder) +#define bridge_to_meson_dw_hdmi (x) \ + container_of(x, struct meson_dw_hdmi, bridge)static inline int dw_hdmi_is_compatible (struct meson_dw_hdmi *dw_hdmi,const char *compat)
@@ -368,7 +372,7 @@ static inline void meson_dw_hdmi_phy_reset(struct meson_dw_hdmi *dw_hdmi) }static void dw_hdmi_set_vclk (struct meson_dw_hdmi *dw_hdmi, -struct drm_display_mode *mode) +const struct drm_display_mode *mode) {struct meson_drm *priv = dw_hdmi->priv;int vic =drm_match_cea_mode (mode);
@@ -663,6 +667,10 @@ dw_hdmi_mode_valid(struct drm_connector *connector,/* Encoder */ +static const u32 meson_dw_hdmi_out_bus_fmts[] = { +MEDIA_BUS_FMT_YUV8_1X24 , +}; +static void meson_venc_hdmi_encoder_destroy (struct drm_encoder *encoder) {drm_encoder_cleanup (encoder);
@@ -672,16 +680,43 @@ static const struct drm_encoder_funcs meson_venc_hdmi_encoder_funcs = { .destroy = meson_venc_hdmi_encoder_destroy, }; -static int meson_venc_hdmi_encoder_atomic_check (struct drm_encoder *encoder, +static u32 * +meson_venc_hdmi_encoder_get_inp_bus_fmts (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state, +u32 output_fmt, +unsigned int *num_input_fmts) +{ +u32 *input_fmts =NULL ; + +if (output_fmt == meson_dw_hdmi_out_bus_fmts[0 ]) { + *num_input_fmts =1 ; + input_fmts =kcalloc (*num_input_fmts, +sizeof (*input_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + + input_fmts[0 ] = output_fmt; + }else { + *num_input_fmts =0 ; + } + +return input_fmts; +} + +static int meson_venc_hdmi_encoder_atomic_check (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state,struct drm_crtc_state *crtc_state,struct drm_connector_state *conn_state) {return 0 ; } -static void meson_venc_hdmi_encoder_disable (struct drm_encoder *encoder) +static void meson_venc_hdmi_encoder_disable (struct drm_bridge *bridge) { -struct meson_dw_hdmi *dw_hdmi =encoder_to_meson_dw_hdmi (encoder); +struct meson_dw_hdmi *dw_hdmi =bridge_to_meson_dw_hdmi (bridge);struct meson_drm *priv = dw_hdmi->priv;DRM_DEBUG_DRIVER ("\n" );
@@ -693,9 +728,9 @@ static void meson_venc_hdmi_encoder_disable(struct drm_encoder *encoder)writel_relaxed (0 , priv->io_base +_REG (ENCP_VIDEO_EN )); } -static void meson_venc_hdmi_encoder_enable (struct drm_encoder *encoder) +static void meson_venc_hdmi_encoder_enable (struct drm_bridge *bridge) { -struct meson_dw_hdmi *dw_hdmi =encoder_to_meson_dw_hdmi (encoder); +struct meson_dw_hdmi *dw_hdmi =bridge_to_meson_dw_hdmi (bridge);struct meson_drm *priv = dw_hdmi->priv;DRM_DEBUG_DRIVER ("%s\n" , priv->venc.hdmi_use_enci ?"VENCI" :"VENCP" );
@@ -706,11 +741,11 @@ static void meson_venc_hdmi_encoder_enable(struct drm_encoder *encoder)writel_relaxed (1 , priv->io_base +_REG (ENCP_VIDEO_EN )); } -static void meson_venc_hdmi_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) +static void meson_venc_hdmi_encoder_mode_set (struct drm_bridge *bridge, +const struct drm_display_mode *mode, +const struct drm_display_mode *adjusted_mode) { -struct meson_dw_hdmi *dw_hdmi =encoder_to_meson_dw_hdmi (encoder); +struct meson_dw_hdmi *dw_hdmi =bridge_to_meson_dw_hdmi (bridge);struct meson_drm *priv = dw_hdmi->priv;int vic =drm_match_cea_mode (mode);
@@ -726,12 +761,15 @@ static void meson_venc_hdmi_encoder_mode_set(struct drm_encoder *encoder,writel_relaxed (0 , priv->io_base +_REG (VPU_HDMI_FMT_CTRL )); } -static const struct drm_encoder_helper_funcs - meson_venc_hdmi_encoder_helper_funcs = { - .atomic_check = meson_venc_hdmi_encoder_atomic_check, - .disable = meson_venc_hdmi_encoder_disable, - .enable = meson_venc_hdmi_encoder_enable, - .mode_set = meson_venc_hdmi_encoder_mode_set, +static const struct drm_bridge_funcs meson_venc_hdmi_encoder_bridge_funcs = { + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_get_input_bus_fmts = meson_venc_hdmi_encoder_get_inp_bus_fmts, + .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_check = meson_venc_hdmi_encoder_atomic_check, + .enable = meson_venc_hdmi_encoder_enable, + .disable = meson_venc_hdmi_encoder_disable, + .mode_set = meson_venc_hdmi_encoder_mode_set, };/* DW HDMI Regmap */
@@ -852,6 +890,7 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,struct drm_device *drm = data;struct meson_drm *priv = drm->dev_private;struct dw_hdmi_plat_data *dw_plat_data; +struct drm_bridge *next_bridge;struct drm_encoder *encoder;struct resource *res;int irq;
@@ -953,8 +992,6 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,/* Encoder */ -drm_encoder_helper_add (encoder, &meson_venc_hdmi_encoder_helper_funcs); - ret =drm_encoder_init (drm, encoder, &meson_venc_hdmi_encoder_funcs,DRM_MODE_ENCODER_TMDS ,"meson_hdmi" );if (ret) {
@@ -962,6 +999,9 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,return ret; } + meson_dw_hdmi->bridge.funcs = &meson_venc_hdmi_encoder_bridge_funcs; +drm_bridge_attach (encoder, &meson_dw_hdmi->bridge,NULL ,0 ); + encoder->possible_crtcs =BIT (0 );DRM_DEBUG_DRIVER ("encoder initialized\n" );
@@ -984,11 +1024,16 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,platform_set_drvdata (pdev, meson_dw_hdmi); - meson_dw_hdmi->hdmi =dw_hdmi_bind (pdev, encoder, - &meson_dw_hdmi->dw_plat_data); + meson_dw_hdmi->hdmi =dw_hdmi_probe (pdev, + &meson_dw_hdmi->dw_plat_data);if (IS_ERR (meson_dw_hdmi->hdmi))return PTR_ERR (meson_dw_hdmi->hdmi); + next_bridge =of_drm_find_bridge (pdev->dev.of_node); +if (next_bridge) +drm_bridge_attach (encoder, next_bridge, + &meson_dw_hdmi->bridge,0 ); +DRM_DEBUG_DRIVER ("HDMI controller initialized\n" );return 0 ;
Signature · 1 line
2.22.0
PATCH v5 8/11 drm/meson: dw-hdmi: stop enforcing input_bus_format
In reply to Neil ArmstrongTo allow using formats from negotiation, stop enforcing input_bus_format in the private dw-plat-data struct.
--- drivers/gpu/drm/meson/meson_dw_hdmi.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/meson/meson_dw_hdmi.c +0 -1
@@ -1014,7 +1014,6 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, dw_plat_data->phy_ops = &meson_dw_hdmi_phy_ops; dw_plat_data->phy_name ="meson_dw_hdmi_phy" ; dw_plat_data->phy_data = meson_dw_hdmi; - dw_plat_data->input_bus_format =MEDIA_BUS_FMT_YUV8_1X24 ; dw_plat_data->input_bus_encoding =V4L2_YCBCR_ENC_709 ; if (dw_hdmi_is_compatible(meson_dw_hdmi, "amlogic,meson-gxl-dw-hdmi") ||
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 9/11 drm/meson: venc: add support for YUV420 setup
In reply to Neil ArmstrongThis patch adds encoding support for the YUV420 output from the Amlogic Meson SoCs Video Processing Unit to the HDMI Controller.
The YUV420 is obtained by generating a YUV444 pixel stream like the classic HDMI display modes, but then the Video Encoder output can be configured to down-sample the YUV444 pixel stream to a YUV420 stream.
In addition if pixel stream down-sampling, the Y Cb Cr components must also be mapped differently to align with the HDMI2.0 specifications.
--- drivers/gpu/drm/meson/meson_dw_hdmi.c | 3 ++- drivers/gpu/drm/meson/meson_venc.c | 8 +++++--- drivers/gpu/drm/meson/meson_venc.h | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/meson/meson_dw_hdmi.c +2 -1
@@ -752,7 +752,8 @@ static void meson_venc_hdmi_encoder_mode_set(struct drm_bridge *bridge,DRM_DEBUG_DRIVER ("\"%s\" vic %d\n" , mode->name, vic);/* VENC + VENC-DVI Mode setup */ -meson_venc_hdmi_mode_set (priv, vic, mode); +meson_venc_hdmi_mode_set (priv, vic, ycrcb_map, false, +VPU_HDMI_OUTPUT_CBYCR );/* VCLK Set clock */ dw_hdmi_set_vclk (dw_hdmi, mode);
drivers/gpu/drm/meson/meson_venc.c +5 -3
@@ -946,6 +946,8 @@ bool meson_venc_hdmi_venc_repeat(int vic)EXPORT_SYMBOL_GPL (meson_venc_hdmi_venc_repeat);void meson_venc_hdmi_mode_set (struct meson_drm *priv,int vic, +unsigned int ycrcb_map, +bool yuv420_mode,const struct drm_display_mode *mode) {union meson_hdmi_venc_mode *vmode =NULL ;
@@ -1528,14 +1530,14 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,if (mode->flags &DRM_MODE_FLAG_PVSYNC ) reg |=VPU_HDMI_INV_VSYNC ; -/* Output data format: CbYCr */ - reg |=VPU_HDMI_OUTPUT_CBYCR ; +/* Output data format */ + reg |= ycrcb_map;/* * Write rate to the async FIFO between VENC and HDMI. * One write every 2 wr_clk. */ -if (venc_repeat) +if (venc_repeat || yuv420_mode) reg |=VPU_HDMI_WR_RATE (2 );/*
drivers/gpu/drm/meson/meson_venc.h +2 -0
@@ -60,6 +60,8 @@ extern struct meson_cvbs_enci_mode meson_cvbs_enci_ntsc;void meson_venci_cvbs_mode_set (struct meson_drm *priv,struct meson_cvbs_enci_mode *mode);void meson_venc_hdmi_mode_set (struct meson_drm *priv,int vic, +unsigned int ycrcb_map, +bool yuv420_mode,const struct drm_display_mode *mode);unsigned int meson_venci_get_field (struct meson_drm *priv);
Signature · 1 line
2.22.0
PATCH v5 10/11 drm/meson: vclk: add support for YUV420 setup
In reply to Neil ArmstrongThis patch adds clocking support for the YUV420 output from the Amlogic Meson SoCs Video Processing Unit to the HDMI Controller.
The YUV420 is obtained by generating a YUV444 pixel stream like the classic HDMI display modes, but then the Video Encoder output can be configured to down-sample the YUV444 pixel stream to a YUV420 stream.
This mode needs a different clock generation scheme since the TMDS PHY clock must match the 10x ratio with the YUV420 pixel clock, but the video encoder must run at 2x the pixel clock.
This patch adds the TMDS PHY clock value in all the video clock setup in order to better support these specific uses cases and switch to the Common Clock framework for clocks handling in the future.
--- drivers/gpu/drm/meson/meson_dw_hdmi.c | 24 ++++--- drivers/gpu/drm/meson/meson_vclk.c | 93 +++++++++++++++++++------ drivers/gpu/drm/meson/meson_vclk.h | 7 +- drivers/gpu/drm/meson/meson_venc_cvbs.c | 6 +- 4 files changed, 95 insertions(+), 35 deletions(-)
drivers/gpu/drm/meson/meson_dw_hdmi.c +16 -8
@@ -376,15 +376,19 @@ static void dw_hdmi_set_vclk(struct meson_dw_hdmi *dw_hdmi, {struct meson_drm *priv = dw_hdmi->priv;int vic =drm_match_cea_mode (mode); +unsigned int phy_freq;unsigned int vclk_freq;unsigned int venc_freq;unsigned int hdmi_freq; vclk_freq = mode->clock; +/* TMDS clock is pixel_clock * 10 */ + phy_freq = vclk_freq *10 ; +if (!vic) { -meson_vclk_setup (priv,MESON_VCLK_TARGET_DMT , vclk_freq, - vclk_freq, vclk_freq, false); +meson_vclk_setup (priv,MESON_VCLK_TARGET_DMT , phy_freq, + vclk_freq, vclk_freq, vclk_freq, false);return ; }
@@ -402,11 +406,11 @@ static void dw_hdmi_set_vclk(struct meson_dw_hdmi *dw_hdmi,if (mode->flags &DRM_MODE_FLAG_DBLCLK ) venc_freq /=2 ; -DRM_DEBUG_DRIVER ("vclk:%d venc=%d hdmi=%d enci=%d\n" , - vclk_freq, venc_freq, hdmi_freq, +DRM_DEBUG_DRIVER ("vclk:%d phy=%d venc=%d hdmi=%d enci=%d\n" , + phy_freq, vclk_freq, venc_freq, hdmi_freq, priv->venc.hdmi_use_enci); -meson_vclk_setup (priv,MESON_VCLK_TARGET_HDMI , vclk_freq, +meson_vclk_setup (priv,MESON_VCLK_TARGET_HDMI , phy_freq, vclk_freq, venc_freq, hdmi_freq, priv->venc.hdmi_use_enci); }
@@ -617,6 +621,7 @@ dw_hdmi_mode_valid(struct drm_connector *connector, const struct drm_display_mode *mode) {struct meson_drm *priv = connector->dev->dev_private; +unsigned int phy_freq;unsigned int vclk_freq;unsigned int venc_freq;unsigned int hdmi_freq;
@@ -643,6 +648,9 @@ dw_hdmi_mode_valid(struct drm_connector *connector, vclk_freq = mode->clock; +/* TMDS clock is pixel_clock * 10 */ + phy_freq = vclk_freq *10 ; +/* 480i/576i needs global pixel doubling */ if (mode->flags &DRM_MODE_FLAG_DBLCLK ) vclk_freq *=2 ;
@@ -659,10 +667,10 @@ dw_hdmi_mode_valid(struct drm_connector *connector,if (mode->flags &DRM_MODE_FLAG_DBLCLK ) venc_freq /=2 ; -dev_dbg (connector->dev->dev,"%s: vclk:%d venc=%d hdmi=%d\n" , __func__, - vclk_freq, venc_freq, hdmi_freq); +dev_dbg (connector->dev->dev,"%s: vclk:%d phy=%d venc=%d hdmi=%d\n" , + __func__, phy_freq, vclk_freq, venc_freq, hdmi_freq); -return meson_vclk_vic_supported_freq (vclk_freq); +return meson_vclk_vic_supported_freq (phy_freq, vclk_freq); }/* Encoder */
drivers/gpu/drm/meson/meson_vclk.c +71 -22
203 lines not on this page · raw message
drivers/gpu/drm/meson/meson_vclk.h +4 -3
@@ -25,10 +25,11 @@ enum {enum drm_mode_status meson_vclk_dmt_supported_freq (struct meson_drm *priv,unsigned int freq);enum drm_mode_status -meson_vclk_vic_supported_freq (unsigned int freq); +meson_vclk_vic_supported_freq (unsigned int phy_freq,unsigned int vclk_freq);void meson_vclk_setup (struct meson_drm *priv,unsigned int target, -unsigned int vclk_freq,unsigned int venc_freq, -unsigned int dac_freq,bool hdmi_use_enci); +unsigned int phy_freq,unsigned int vclk_freq, +unsigned int venc_freq,unsigned int dac_freq, +bool hdmi_use_enci);#endif /* __MESON_VCLK_H */
drivers/gpu/drm/meson/meson_venc_cvbs.c +4 -2
@@ -213,8 +213,10 @@ static void meson_venc_cvbs_encoder_mode_set(struct drm_encoder *encoder,meson_venci_cvbs_mode_set (priv, meson_mode->enci);/* Setup 27MHz vclk2 for ENCI and VDAC */ -meson_vclk_setup (priv,MESON_VCLK_TARGET_CVBS ,MESON_VCLK_CVBS , -MESON_VCLK_CVBS ,MESON_VCLK_CVBS , true); +meson_vclk_setup (priv,MESON_VCLK_TARGET_CVBS , +MESON_VCLK_CVBS ,MESON_VCLK_CVBS , +MESON_VCLK_CVBS ,MESON_VCLK_CVBS , + true); } }
Signature · 1 line
2.22.0
PATCH v5 11/11 drm/meson: Add YUV420 output support
In reply to Neil ArmstrongThis patch adds support for the YUV420 output from the Amlogic Meson SoCs Video Processing Unit to the HDMI Controller.
The YUV420 is obtained by generating a YUV444 pixel stream like the classic HDMI display modes, but then the Video Encoder output can be configured to down-sample the YUV444 pixel stream to a YUV420 stream.
In addition if pixel stream down-sampling, the Y Cb Cr components must also be mapped differently to align with the HDMI2.0 specifications.
This mode needs a different clock generation scheme since the TMDS PHY clock must match the 10x ratio with the YUV420 pixel clock, but the video encoder must run at 2x the pixel clock.
This patch enables the bridge bus format negociation, and handles the YUV420 case if selected by the negociation.
--- drivers/gpu/drm/meson/meson_dw_hdmi.c | 91 ++++++++++++++++++++------- 1 file changed, 70 insertions(+), 21 deletions(-)
drivers/gpu/drm/meson/meson_dw_hdmi.c +70 -21
@@ -150,6 +150,7 @@ struct meson_dw_hdmi {struct regulator *hdmi_supply;u32 irq_stat;struct dw_hdmi *hdmi; +unsigned long output_bus_fmt; };#define encoder_to_meson_dw_hdmi (x) \ container_of(x, struct meson_dw_hdmi, encoder)
@@ -301,6 +302,10 @@ static void meson_hdmi_phy_setup_mode(struct meson_dw_hdmi *dw_hdmi,struct meson_drm *priv = dw_hdmi->priv;unsigned int pixel_clock = mode->clock; +/* For 420, pixel clock is half unlike venc clock */ +if (dw_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 ) + pixel_clock /=2 ; +if (dw_hdmi_is_compatible (dw_hdmi,"amlogic,meson-gxl-dw-hdmi" ) ||dw_hdmi_is_compatible (dw_hdmi,"amlogic,meson-gxm-dw-hdmi" )) {if (pixel_clock >=371250 ) {
@@ -383,6 +388,10 @@ static void dw_hdmi_set_vclk(struct meson_dw_hdmi *dw_hdmi, vclk_freq = mode->clock; +/* For 420, pixel clock is half unlike venc clock */ +if (dw_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 ) + vclk_freq /=2 ; +/* TMDS clock is pixel_clock * 10 */ phy_freq = vclk_freq *10 ;
@@ -392,13 +401,16 @@ static void dw_hdmi_set_vclk(struct meson_dw_hdmi *dw_hdmi,return ; } +/* 480i/576i needs global pixel doubling */ if (mode->flags &DRM_MODE_FLAG_DBLCLK ) vclk_freq *=2 ; venc_freq = vclk_freq; hdmi_freq = vclk_freq; -if (meson_venc_hdmi_venc_repeat (vic)) +/* VENC double pixels for 1080i, 720p and YUV420 modes */ +if (meson_venc_hdmi_venc_repeat (vic) || + dw_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 ) venc_freq *=2 ; vclk_freq =max (venc_freq, hdmi_freq);
@@ -445,8 +457,9 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data,/* Enable normal output to PHY */ dw_hdmi->data->top_write (dw_hdmi,HDMITX_TOP_BIST_CNTL ,BIT (12 )); -/* TMDS pattern setup (TOFIX Handle the YUV420 case) */ -if (mode->clock >340000 ) { +/* TMDS pattern setup */ +if (mode->clock >340000 && + dw_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_YUV8_1X24 ) { dw_hdmi->data->top_write (dw_hdmi,HDMITX_TOP_TMDS_CLK_PTTN_01 ,0 ); dw_hdmi->data->top_write(dw_hdmi, HDMITX_TOP_TMDS_CLK_PTTN_23,
@@ -621,6 +634,7 @@ dw_hdmi_mode_valid(struct drm_connector *connector, const struct drm_display_mode *mode) {struct meson_drm *priv = connector->dev->dev_private; +bool is_hdmi2_sink = connector->display_info.hdmi.scdc.supported;unsigned int phy_freq;unsigned int vclk_freq;unsigned int venc_freq;
@@ -630,9 +644,11 @@ dw_hdmi_mode_valid(struct drm_connector *connector,DRM_DEBUG_DRIVER ("Modeline " DRM_MODE_FMT "\n" ,DRM_MODE_ARG (mode)); -/* If sink max TMDS clock, we reject the mode */ +/* If sink does not support 540MHz, reject the non-420 HDMI2 modes */ if (connector->display_info.max_tmds_clock && - mode->clock > connector->display_info.max_tmds_clock) + mode->clock > connector->display_info.max_tmds_clock && + !drm_mode_is_420_only (&connector->display_info, mode) && + !drm_mode_is_420_also (&connector->display_info, mode))return MODE_BAD ;/* Check against non-VIC supported modes */
@@ -648,6 +664,12 @@ dw_hdmi_mode_valid(struct drm_connector *connector, vclk_freq = mode->clock; +/* For 420, pixel clock is half unlike venc clock */ +if (drm_mode_is_420_only (&connector->display_info, mode) || + (!is_hdmi2_sink && +drm_mode_is_420_also (&connector->display_info, mode))) + vclk_freq /=2 ; +/* TMDS clock is pixel_clock * 10 */ phy_freq = vclk_freq *10 ;
@@ -658,8 +680,11 @@ dw_hdmi_mode_valid(struct drm_connector *connector, venc_freq = vclk_freq; hdmi_freq = vclk_freq; -/* VENC double pixels for 1080i and 720p modes */ -if (meson_venc_hdmi_venc_repeat (vic)) +/* VENC double pixels for 1080i, 720p and YUV420 modes */ +if (meson_venc_hdmi_venc_repeat (vic) || +drm_mode_is_420_only (&connector->display_info, mode) || + (!is_hdmi2_sink && +drm_mode_is_420_also (&connector->display_info, mode))) venc_freq *=2 ; vclk_freq =max (venc_freq, hdmi_freq);
@@ -677,6 +702,7 @@ dw_hdmi_mode_valid(struct drm_connector *connector,static const u32 meson_dw_hdmi_out_bus_fmts[] = {MEDIA_BUS_FMT_YUV8_1X24 , +MEDIA_BUS_FMT_UYYVYY8_0_5X24 , };static void meson_venc_hdmi_encoder_destroy (struct drm_encoder *encoder)
@@ -697,18 +723,23 @@ meson_venc_hdmi_encoder_get_inp_bus_fmts(struct drm_bridge *bridge, unsigned int *num_input_fmts) {u32 *input_fmts =NULL ; +int i; -if (output_fmt == meson_dw_hdmi_out_bus_fmts[0 ]) { - *num_input_fmts =1 ; - input_fmts =kcalloc (*num_input_fmts, -sizeof (*input_fmts), -GFP_KERNEL ); -if (!input_fmts) -return NULL ; + *num_input_fmts =0 ; - input_fmts[0 ] = output_fmt; - }else { - *num_input_fmts =0 ; +for (i =0 ; i <ARRAY_SIZE (meson_dw_hdmi_out_bus_fmts) ; ++i) { +if (output_fmt == meson_dw_hdmi_out_bus_fmts[i]) { + *num_input_fmts =1 ; + input_fmts =kcalloc (*num_input_fmts, +sizeof (*input_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + + input_fmts[0 ] = output_fmt; + +break ; + } }return input_fmts;
@@ -719,6 +750,12 @@ static int meson_venc_hdmi_encoder_atomic_check(struct drm_bridge *bridge,struct drm_crtc_state *crtc_state, struct drm_connector_state *conn_state) { + struct meson_dw_hdmi *dw_hdmi = bridge_to_meson_dw_hdmi(bridge); + + dw_hdmi->output_bus_fmt = bridge_state->output_bus_cfg.format; + +DRM_DEBUG_DRIVER ("output_bus_fmt %lx\n" , dw_hdmi->output_bus_fmt); +return 0 ; }
@@ -756,18 +793,29 @@ static void meson_venc_hdmi_encoder_mode_set(struct drm_bridge *bridge,struct meson_dw_hdmi *dw_hdmi =bridge_to_meson_dw_hdmi (bridge);struct meson_drm *priv = dw_hdmi->priv;int vic =drm_match_cea_mode (mode); +unsigned int ycrcb_map =VPU_HDMI_OUTPUT_CBYCR ; +bool yuv420_mode = false;DRM_DEBUG_DRIVER ("\"%s\" vic %d\n" , mode->name, vic); +if (dw_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 ) { + ycrcb_map =VPU_HDMI_OUTPUT_CRYCB ; + yuv420_mode = true; + } +/* VENC + VENC-DVI Mode setup */ -meson_venc_hdmi_mode_set (priv, vic, ycrcb_map, false, -VPU_HDMI_OUTPUT_CBYCR ); +meson_venc_hdmi_mode_set (priv, vic, ycrcb_map, yuv420_mode, mode);/* VCLK Set clock */ dw_hdmi_set_vclk (dw_hdmi, mode); -/* Setup YUV444 to HDMI-TX, no 10bit diphering */ -writel_relaxed (0 , priv->io_base +_REG (VPU_HDMI_FMT_CTRL )); +if (dw_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 ) +/* Setup YUV420 to HDMI-TX, no 10bit diphering */ +writel_relaxed (2 | (2 <<2 ), + priv->io_base +_REG (VPU_HDMI_FMT_CTRL )); +else +/* Setup YUV444 to HDMI-TX, no 10bit diphering */ +writel_relaxed (0 , priv->io_base +_REG (VPU_HDMI_FMT_CTRL )); }static const struct drm_bridge_funcs meson_venc_hdmi_encoder_bridge_funcs = {
@@ -1024,6 +1072,7 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, dw_plat_data->phy_name ="meson_dw_hdmi_phy" ; dw_plat_data->phy_data = meson_dw_hdmi; dw_plat_data->input_bus_encoding =V4L2_YCBCR_ENC_709 ; + dw_plat_data->ycbcr_420_allowed = true; if (dw_hdmi_is_compatible(meson_dw_hdmi, "amlogic,meson-gxl-dw-hdmi") || dw_hdmi_is_compatible(meson_dw_hdmi, "amlogic,meson-gxm-dw-hdmi") ||
Signature · 1 line
2.22.0
Neil Armstrong
AppliedQuoted 71 lines · Neil Armstrong
Hi Philippe, Heiko, Maxime, Laurent,
A bad negociation was detected on platforms not implementing a bridge on the encoder side, which has been fixed in this version.
Could you check it doesn't break your platforms using dw-hdmi ? Especially patches 1-5.
Thanks,
NeilThis patchset is based on Boris's merged "drm: Add support for bus-format negotiation" patchset to implement full bus-format negotiation for DW-HDMI, including YUV420 support and 10/12/16bit YUV444, YUV422 and RGB. The Color Space Converter support is already implemented.
And the counterpart implementation in the Amlogic Meson VPU dw-hdmi glue :
- basic bus-format negotiation to select YUV444 bus-format as DW-HDMI input
- YUV420 support when HDMI2.0 YUV420 modesetThis is a follow-up from the previous attempts :
- "drm/meson: Add support for HDMI2.0 YUV420 4k60" at [2]
- "drm/meson: Add support for HDMI2.0 4k60" at [3]Changes since v4 at [7]:
- Cleaned up patch 1
- Added comment on patch 2
- Added commit message on patch 3
- Fixed invalid negociation when encoder is not yet a bridge (seen on allwinner & rockchip platforms) on patch 4
- Fixed invalid defines, handledMEDIA_BUS_FMT_FIXEDand cleaned negociation debug on patch 4
- Added tags on patch 5, 6
- Removedmeson_venc_hdmi_encoder_get_out_bus_fmtson patch 7
- Add off-list r-b from JernejChanges since v3 at [6]:
- Added "Plug atomic state hooks to the default implementation" on drm/bridge: dw-hdmi
- Also added these atomic state hooks in meson-dw-hdmi in patch 7
- Rebased on latest drm-misc-next including patches 1-7 of [1]Changes since RFC v2 at [5]:
- Added fixes from Jonas, who tested and integrated it for Rockchip SoCs
- Added support for 10/12/16bit tmds clock calculation
- Added support formax_bcpconnector property
- Adapted to Boris's v4 patchset
- Fixed typos reported by borisChanges since RFC v1 at [4]:
- Rewrote negociation using the v2 patchset, including full DW-HDMI fmt negociation[2] https://patchwork.freedesktop.org/patch/msgid/[email protected]
[3] https://patchwork.freedesktop.org/patch/msgid/[email protected]
[4] https://patchwork.freedesktop.org/patch/msgid/[email protected]
[5] https://patchwork.freedesktop.org/patch/msgid/[email protected]
[6] https://patchwork.freedesktop.org/patch/msgid/[email protected]
[7] https://patchwork.freedesktop.org/patch/msgid/[email protected]Jonas Karlman (2):
drm/bridge: dw-hdmi: set mtmdsclock for deep color drm/bridge: dw-hdmi: add max bpc connector propertyNeil Armstrong (9):
drm/bridge: dw-hdmi: Plug atomic state hooks to the default
implementation
drm/bridge: synopsys: dw-hdmi: add bus format negociation drm/bridge: synopsys: dw-hdmi: allow ycbcr420 modes for >=0x200adrm/meson: venc: makedrm_display_modeconst
drm/meson:meson_dw_hdmi: add bridge and switch todrm_bridge_funcsdrm/meson: dw-hdmi: stop enforcinginput_bus_formatdrm/meson: venc: add support for YUV420 setup
drm/meson: vclk: add support for YUV420 setup
drm/meson: Add YUV420 output support
Quoted 10 lines
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 319 +++++++++++++++++++++- drivers/gpu/drm/meson/meson_dw_hdmi.c | 180 +++++++++--- drivers/gpu/drm/meson/meson_vclk.c | 93 +++++-- drivers/gpu/drm/meson/meson_vclk.h | 7 +- drivers/gpu/drm/meson/meson_venc.c | 10 +- drivers/gpu/drm/meson/meson_venc.h | 4 +- drivers/gpu/drm/meson/meson_venc_cvbs.c | 6 +- include/drm/bridge/dw_hdmi.h | 1 + 8 files changed, 544 insertions(+), 76 deletions(-)
Pushed to drm-misc-next
Neil
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
This series was applied to khilman/linux-amlogic.git (refs/heads/for-next).
Hello:
This series was applied to khilman/linux-amlogic.git (refs/heads/for-next).
Quoted 9 lines · On Wed, 4 Mar 2020 11:40:41 +0100 you wrote:
Hi Philippe, Heiko, Maxime, Laurent,
A bad negociation was detected on platforms not implementing a bridge on the encoder side, which has been fixed in this version.
Could you check it doesn't break your platforms using dw-hdmi ? Especially patches 1-5.
[...]
Here is a summary with links:
- [v5,01/11] drm/bridge: dw-hdmi: set mtmdsclock for deep color
https://git.kernel.org/khilman/linux-amlogic/c/c6cae702340069d9f48925bd2201359602a72e83 - [v5,02/11] drm/bridge: dw-hdmi: add max bpc connector property https://git.kernel.org/khilman/linux-amlogic/c/b8e810e868f73a698af9bde1ac51a332c0f61fc4 - [v5,03/11] drm/bridge: dw-hdmi: Plug atomic state hooks to the default implementation https://git.kernel.org/khilman/linux-amlogic/c/a5cf9e2e52b638ae62049bf06d2283f5d757ac7d - [v5,04/11] drm/bridge: synopsys: dw-hdmi: add bus format negociation https://git.kernel.org/khilman/linux-amlogic/c/6c3c719936dafeb5df3a625cd57a674bf1d6ef31 - [v5,05/11] drm/bridge: synopsys: dw-hdmi: allow ycbcr420 modes for >= 0x200a https://git.kernel.org/khilman/linux-amlogic/c/f14d3f6c39f39acf0eec90f4dcf1105f7be1fc1b - [v5,06/11] drm/meson: venc: make drm_display_mode const https://git.kernel.org/khilman/linux-amlogic/c/0fad640bbfed33e7e2a8db056e3782b396c42185 - [v5,07/11] drm/meson: meson_dw_hdmi: add bridge and switch to drm_bridge_funcs https://git.kernel.org/khilman/linux-amlogic/c/f43aa58432de8fba8975826eedbd51425b791688 - [v5,08/11] drm/meson: dw-hdmi: stop enforcing input_bus_format https://git.kernel.org/khilman/linux-amlogic/c/1fd34184aab0fe04c5d50af01a37fe1bb8bd6595 - [v5,09/11] drm/meson: venc: add support for YUV420 setup https://git.kernel.org/khilman/linux-amlogic/c/64db601a9561778b41add87270daf512c9bf0433 - [v5,10/11] drm/meson: vclk: add support for YUV420 setup https://git.kernel.org/khilman/linux-amlogic/c/e5fab2ec9ca4f7db47aaf1d7f39e43a13b03a4b7 - [v5,11/11] drm/meson: Add YUV420 output support https://git.kernel.org/khilman/linux-amlogic/c/8496a2172d7cd25d1baa734b756cbee4574d4652
You are awesome, thank you!
Signature · 7 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic