by Tomi Valkeinen

[permalink] [raw]

Subject: Re: [PATCH v4 6/7] drm: xlnx: zynqmp_dpsub: Set input live format

On 16/04/2024 23:31, Anatoliy Klymenko wrote:
> Program live video input format according to selected media bus format.
>
> In the bridge mode of operation, DPSUB is connected to FPGA CRTC which
> almost certainly supports a single media bus format as its output. Expect
> this to be delivered via the new bridge atomic state. Program DPSUB
> registers accordingly.
>
> Signed-off-by: Anatoliy Klymenko <[email protected]>
> ---
> drivers/gpu/drm/xlnx/zynqmp_disp.c | 92 ++++++++++++++++++++++++++++++++------
> drivers/gpu/drm/xlnx/zynqmp_disp.h | 2 +
> drivers/gpu/drm/xlnx/zynqmp_dp.c | 13 ++++--
> 3 files changed, 90 insertions(+), 17 deletions(-)
>

Reviewed-by: Tomi Valkeinen <[email protected]>

Tomi

> diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c
> index 8cdd74a9b772..13157da0089e 100644
> --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c
> +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c
> @@ -436,19 +436,29 @@ static void zynqmp_disp_avbuf_set_format(struct zynqmp_disp *disp,
> const struct zynqmp_disp_format *fmt)
> {
> unsigned int i;
> - u32 val;
> + u32 val, reg;
>
> - val = zynqmp_disp_avbuf_read(disp, ZYNQMP_DISP_AV_BUF_FMT);
> - val &= zynqmp_disp_layer_is_video(layer)
> - ? ~ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MASK
> - : ~ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_MASK;
> - val |= fmt->buf_fmt;
> - zynqmp_disp_avbuf_write(disp, ZYNQMP_DISP_AV_BUF_FMT, val);
> + layer->disp_fmt = fmt;
> + if (layer->mode == ZYNQMP_DPSUB_LAYER_NONLIVE) {
> + reg = ZYNQMP_DISP_AV_BUF_FMT;
> + val = zynqmp_disp_avbuf_read(disp, ZYNQMP_DISP_AV_BUF_FMT);
> + val &= zynqmp_disp_layer_is_video(layer)
> + ? ~ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MASK
> + : ~ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_MASK;
> + val |= fmt->buf_fmt;
> + zynqmp_disp_avbuf_write(disp, reg, val);
> + } else {
> + reg = zynqmp_disp_layer_is_video(layer)
> + ? ZYNQMP_DISP_AV_BUF_LIVE_VID_CONFIG
> + : ZYNQMP_DISP_AV_BUF_LIVE_GFX_CONFIG;
> + val = fmt->buf_fmt;
> + zynqmp_disp_avbuf_write(disp, reg, val);
> + }
>
> for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_SF; i++) {
> - unsigned int reg = zynqmp_disp_layer_is_video(layer)
> - ? ZYNQMP_DISP_AV_BUF_VID_COMP_SF(i)
> - : ZYNQMP_DISP_AV_BUF_GFX_COMP_SF(i);
> + reg = zynqmp_disp_layer_is_video(layer)
> + ? ZYNQMP_DISP_AV_BUF_VID_COMP_SF(i)
> + : ZYNQMP_DISP_AV_BUF_GFX_COMP_SF(i);
>
> zynqmp_disp_avbuf_write(disp, reg, fmt->sf[i]);
> }
> @@ -926,6 +936,31 @@ zynqmp_disp_layer_find_format(struct zynqmp_disp_layer *layer,
> return NULL;
> }
>
> +/**
> + * zynqmp_disp_layer_find_live_format - Find format information for given
> + * media bus format
> + * @layer: The layer
> + * @drm_fmt: Media bus format to search
> + *
> + * Search display subsystem format information corresponding to the given media
> + * bus format @media_bus_format for the @layer, and return a pointer to the
> + * format descriptor.
> + *
> + * Return: A pointer to the format descriptor if found, NULL otherwise
> + */
> +static const struct zynqmp_disp_format *
> +zynqmp_disp_layer_find_live_format(struct zynqmp_disp_layer *layer,
> + u32 media_bus_format)
> +{
> + unsigned int i;
> +
> + for (i = 0; i < layer->info->num_formats; i++)
> + if (layer->info->formats[i].bus_fmt == media_bus_format)
> + return &layer->info->formats[i];
> +
> + return NULL;
> +}
> +
> /**
> * zynqmp_disp_layer_drm_formats - Return the DRM formats supported by the layer
> * @layer: The layer
> @@ -1040,6 +1075,9 @@ void zynqmp_disp_layer_disable(struct zynqmp_disp_layer *layer)
> * @layer: The layer
> * @info: The format info
> *
> + * NOTE: Use zynqmp_disp_layer_set_live_format() to set media bus format for
> + * live video layers.
> + *
> * Set the format for @layer to @info. The layer must be disabled.
> */
> void zynqmp_disp_layer_set_format(struct zynqmp_disp_layer *layer,
> @@ -1047,14 +1085,16 @@ void zynqmp_disp_layer_set_format(struct zynqmp_disp_layer *layer,
> {
> unsigned int i;
>
> + if (WARN_ON(layer->mode != ZYNQMP_DPSUB_LAYER_NONLIVE))
> + return;
> +
> layer->disp_fmt = zynqmp_disp_layer_find_format(layer, info->format);
> + if (WARN_ON(!layer->disp_fmt))
> + return;
> layer->drm_fmt = info;
>
> zynqmp_disp_avbuf_set_format(layer->disp, layer, layer->disp_fmt);
>
> - if (layer->mode == ZYNQMP_DPSUB_LAYER_LIVE)
> - return;
> -
> /*
> * Set pconfig for each DMA channel to indicate they're part of a
> * video group.
> @@ -1074,6 +1114,32 @@ void zynqmp_disp_layer_set_format(struct zynqmp_disp_layer *layer,
> }
> }
>
> +/**
> + * zynqmp_disp_layer_set_live_format - Set the live video layer format
> + * @layer: The layer
> + * @info: The format info
> + *
> + * NOTE: This function should not be used to set format for non-live video
> + * layer. Use zynqmp_disp_layer_set_format() instead.
> + *
> + * Set the display format for the live @layer. The layer must be disabled.
> + */
> +void zynqmp_disp_layer_set_live_format(struct zynqmp_disp_layer *layer,
> + u32 media_bus_format)
> +{
> + if (WARN_ON(layer->mode != ZYNQMP_DPSUB_LAYER_LIVE))
> + return;
> +
> + layer->disp_fmt = zynqmp_disp_layer_find_live_format(layer,
> + media_bus_format);
> + if (WARN_ON(!layer->disp_fmt))
> + return;
> +
> + zynqmp_disp_avbuf_set_format(layer->disp, layer, layer->disp_fmt);
> +
> + layer->drm_fmt = drm_format_info(layer->disp_fmt->drm_fmt);
> +}
> +
> /**
> * zynqmp_disp_layer_update - Update the layer framebuffer
> * @layer: The layer
> diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.h b/drivers/gpu/drm/xlnx/zynqmp_disp.h
> index efd1c52c2916..fa545533c9d1 100644
> --- a/drivers/gpu/drm/xlnx/zynqmp_disp.h
> +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.h
> @@ -58,6 +58,8 @@ void zynqmp_disp_layer_enable(struct zynqmp_disp_layer *layer);
> void zynqmp_disp_layer_disable(struct zynqmp_disp_layer *layer);
> void zynqmp_disp_layer_set_format(struct zynqmp_disp_layer *layer,
> const struct drm_format_info *info);
> +void zynqmp_disp_layer_set_live_format(struct zynqmp_disp_layer *layer,
> + u32 media_bus_format);
> int zynqmp_disp_layer_update(struct zynqmp_disp_layer *layer,
> struct drm_plane_state *state);
>
> diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c
> index faaeea526970..a7fa5e2abb9b 100644
> --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c
> +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c
> @@ -1299,15 +1299,20 @@ static void zynqmp_dp_disp_enable(struct zynqmp_dp *dp,
> struct drm_bridge_state *old_bridge_state)
> {
> struct zynqmp_disp_layer *layer;
> - const struct drm_format_info *info;
> + struct drm_bridge_state *bridge_state;
> + u32 bus_fmt;
>
> layer = zynqmp_dp_disp_connected_live_layer(dp);
> if (!layer)
> return;
>
> - /* TODO: Make the format configurable. */
> - info = drm_format_info(DRM_FORMAT_YUV422);
> - zynqmp_disp_layer_set_format(layer, info);
> + bridge_state = drm_atomic_get_new_bridge_state(old_bridge_state->base.state,
> + old_bridge_state->bridge);
> + if (WARN_ON(!bridge_state))
> + return;
> +
> + bus_fmt = bridge_state->input_bus_cfg.format;
> + zynqmp_disp_layer_set_live_format(layer, bus_fmt);
> zynqmp_disp_layer_enable(layer);
>
> if (layer == dp->dpsub->layers[ZYNQMP_DPSUB_LAYER_GFX])
>

2024-04-17 15:18:06

by Conor Dooley

[permalink] [raw]

Subject: Re: [PATCH v4 0/7] Managing live video input format for ZynqMP DPSUB

On Tue, Apr 16, 2024 at 01:31:35PM -0700, Anatoliy Klymenko wrote:
> Implement live video input format setting for ZynqMP DPSUB.

> To: Conor Dooley <[email protected]>

If there's nothing dt related here anymore, you can drop me :)

Attachments:

(No filename) (241.00 B)
signature.asc (235.00 B)
Download all attachments

2024-04-24 14:55:40

by Tomi Valkeinen

[permalink] [raw]

Subject: Re: [PATCH v4 0/7] Managing live video input format for ZynqMP DPSUB

Hi,

On 16/04/2024 23:31, Anatoliy Klymenko wrote:
> Implement live video input format setting for ZynqMP DPSUB.
>
> ZynqMP DPSUB can operate in 2 modes: DMA-based and live.
>
> In the live mode, DPSUB receives a live video signal from FPGA-based CRTC.
> DPSUB acts as a DRM encoder bridge in such a scenario. To properly tune
> into the incoming video signal, DPSUB should be programmed with the proper
> media bus format. This patch series addresses this task.
>
> Patch 1/7: Set the DPSUB layer mode of operation prior to enabling the
> layer. Allows to use layer operational mode before its enablement.
>
> Patch 2/7: Update some IP register defines.
>
> Patch 3/7: Factor out some code into a helper function.
>
> Patch 4/7: Announce supported input media bus formats via
> drm_bridge_funcs.atomic_get_input_bus_fmts callback.
>
> Patch 5/7: Minimize usage of a global flag. Minor improvement.
>
> Patch 6/7: Program DPSUB live video input format based on selected bus
> config in the new atomic bridge state.
>
> Patch 7/7: New optional CRTC atomic helper proposal that will allow to
> negotiate video signal format between CRTC and connected encoder.
> Incorporate this callback into the DRM bridge format negotiation process.
> Save negotiated output format in drm_crtc_state. Reference usage of this
> API is available here:
> https://github.com/onotole/linux/tree/dpsub-live-in

The patches up to and including patch 6 look ready to me. I'll pick them
up to drm-misc.

Tomi

> To: Laurent Pinchart <[email protected]>
> To: Maarten Lankhorst <[email protected]>
> To: Maxime Ripard <[email protected]>
> To: Thomas Zimmermann <[email protected]>
> To: David Airlie <[email protected]>
> To: Daniel Vetter <[email protected]>
> To: Michal Simek <[email protected]>
> To: Andrzej Hajda <[email protected]>
> To: Neil Armstrong <[email protected]>
> To: Robert Foss <[email protected]>
> To: Jonas Karlman <[email protected]>
> To: Jernej Skrabec <[email protected]>
> To: Rob Herring <[email protected]>
> To: Krzysztof Kozlowski <[email protected]>
> To: Conor Dooley <[email protected]>
> To: Mauro Carvalho Chehab <[email protected]>
> Cc: Tomi Valkeinen <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Anatoliy Klymenko <[email protected]>
>
> Changes in v4:
> - Replace controversial reference driver patches with the private
> repository link.
> - Split display layer format manipulation functions into 2 separate cases
> for diferet layer modes.
> - Address misc review comments (typos, comments, etc.)
>
> Link to v3: https://lore.kernel.org/r/[email protected]
>
> Changes in v3:
> - Add connected live layer helper
> - Include reference DRM format in zynqmp_disp_format for live layerss.
> - Add default bus format list for non-live case.
> - Explain removal of redundant checks in the commit message.
> - Minor fixes and improvements from review comments.
>
> Link to v2: https://lore.kernel.org/r/[email protected]
>
> Changes in v2:
> - Factor out register defines update into separate patch.
> - Add some improvements minimizing ithe usage of a global flag.
> - Reuse existing format setting API instead of introducing new versions.
> - Add warning around NULL check on new bridge state within atomic enable
> callback.
> - Add drm_helper_crtc_select_output_bus_format() that wraps
> drm_crtc_helper_funcs.select_output_bus_format().
> - Update API comments per review recommendations.
> - Address some minor review comments.
> - Add reference CRTC driver that demonstrates the usage of the proposed
> drm_crtc_helper_funcs.select_output_bus_format() API.
>
> - Link to v1: https://lore.kernel.org/r/[email protected]
>
> ---
> Anatoliy Klymenko (7):
> drm: xlnx: zynqmp_dpsub: Set layer mode during creation
> drm: xlnx: zynqmp_dpsub: Update live format defines
> drm: xlnx: zynqmp_dpsub: Add connected live layer helper
> drm: xlnx: zynqmp_dpsub: Anounce supported input formats
> drm: xlnx: zynqmp_dpsub: Minimize usage of global flag
> drm: xlnx: zynqmp_dpsub: Set input live format
> drm/atomic-helper: Add select_output_bus_format callback
>
> drivers/gpu/drm/drm_bridge.c | 14 +-
> drivers/gpu/drm/drm_crtc_helper.c | 38 +++++
> drivers/gpu/drm/xlnx/zynqmp_disp.c | 231 +++++++++++++++++++++++++++----
> drivers/gpu/drm/xlnx/zynqmp_disp.h | 17 +--
> drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 8 +-
> drivers/gpu/drm/xlnx/zynqmp_dp.c | 81 ++++++++---
> drivers/gpu/drm/xlnx/zynqmp_kms.c | 2 +-
> include/drm/drm_crtc.h | 11 ++
> include/drm/drm_crtc_helper.h | 5 +
> include/drm/drm_modeset_helper_vtables.h | 30 ++++
> 10 files changed, 372 insertions(+), 65 deletions(-)
> ---
> base-commit: bfa4437fd3938ae2e186e7664b2db65bb8775670
> change-id: 20240226-dp-live-fmt-6415773b5a68
>
> Best regards,