From: Boris Brezillon <boris.brezillon@collabora.com>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: jernej.skrabec@siol.net, jonas@kwiboo.se,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com,
linux-amlogic@lists.infradead.org
Subject: Re: [PATCH RFC v2 2/8] drm/meson: meson_dw_hdmi: switch to drm_bridge_funcs
Date: Tue, 27 Aug 2019 10:53:27 +0200 [thread overview]
Message-ID: <20190827105327.3df8ec37@collabora.com> (raw)
In-Reply-To: <20190827081425.15011-3-narmstrong@baylibre.com>
On Tue, 27 Aug 2019 10:14:19 +0200
Neil Armstrong <narmstrong@baylibre.com> wrote:
> Switch the dw-hdmi driver to drm_bridge_funcs, and implement the
> atomic_get_input_bus_fmts/atomic_get_output_bus_fmts.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> drivers/gpu/drm/meson/meson_dw_hdmi.c | 67 +++++++++++++++++++++------
> 1 file changed, 54 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
> index f893ebd0b799..333583ef3ab9 100644
> --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
> +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
> @@ -368,7 +368,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 +663,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,15 +676,50 @@ 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 void
> +meson_venc_hdmi_encoder_get_out_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,
> + u32 *output_fmts)
> +{
> + *num_output_fmts = ARRAY_SIZE(meson_dw_hdmi_out_bus_fmts);
> +
> + if (output_fmts)
> + memcpy(output_fmts, meson_dw_hdmi_out_bus_fmts,
> + ARRAY_SIZE(meson_dw_hdmi_out_bus_fmts));
> +}
> +
> +static void
> +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)
> +{
> + if (output_fmt == meson_dw_hdmi_out_bus_fmts[0]) {
> + *num_input_fmts = 1;
> + if (input_fmts)
> + input_fmts[0] = output_fmt;
> + }
> + else
> + *num_input_fmts = 0;
nitpick:
} else {
*num_input_fmts = 0;
}
> +}
> +
> +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;
> }
This hook is optional, you don't need this stub.
Looks good otherwise:
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
>
> -static void meson_venc_hdmi_encoder_disable(struct drm_encoder *encoder)
> +static void meson_venc_hdmi_encoder_disable(struct drm_bridge *bridge)
> {
> + struct drm_encoder *encoder = bridge_to_encoder(bridge);
> struct meson_dw_hdmi *dw_hdmi = encoder_to_meson_dw_hdmi(encoder);
> struct meson_drm *priv = dw_hdmi->priv;
>
> @@ -693,8 +732,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 drm_encoder *encoder = bridge_to_encoder(bridge);
> struct meson_dw_hdmi *dw_hdmi = encoder_to_meson_dw_hdmi(encoder);
> struct meson_drm *priv = dw_hdmi->priv;
>
> @@ -706,10 +746,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 drm_encoder *encoder = bridge_to_encoder(bridge);
> struct meson_dw_hdmi *dw_hdmi = encoder_to_meson_dw_hdmi(encoder);
> struct meson_drm *priv = dw_hdmi->priv;
> int vic = drm_match_cea_mode(mode);
> @@ -726,11 +767,12 @@ 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,
> +static const struct drm_bridge_funcs meson_venc_hdmi_encoder_bridge_funcs = {
> .enable = meson_venc_hdmi_encoder_enable,
> + .disable = meson_venc_hdmi_encoder_disable,
> + .atomic_check = meson_venc_hdmi_encoder_atomic_check,
> + .atomic_get_output_bus_fmts = meson_venc_hdmi_encoder_get_out_bus_fmts,
> + .atomic_get_input_bus_fmts = meson_venc_hdmi_encoder_get_inp_bus_fmts,
> .mode_set = meson_venc_hdmi_encoder_mode_set,
> };
>
> @@ -912,8 +954,7 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
>
> /* Encoder */
>
> - drm_encoder_helper_add(encoder, &meson_venc_hdmi_encoder_helper_funcs);
> -
> + encoder->bridge.funcs = &meson_venc_hdmi_encoder_bridge_funcs;
> ret = drm_encoder_init(drm, encoder, &meson_venc_hdmi_encoder_funcs,
> DRM_MODE_ENCODER_TMDS, "meson_hdmi");
> if (ret) {
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
WARNING: multiple messages have this Message-ID (diff)
From: Boris Brezillon <boris.brezillon@collabora.com>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com,
jonas@kwiboo.se, jernej.skrabec@siol.net,
linux-amlogic@lists.infradead.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH RFC v2 2/8] drm/meson: meson_dw_hdmi: switch to drm_bridge_funcs
Date: Tue, 27 Aug 2019 10:53:27 +0200 [thread overview]
Message-ID: <20190827105327.3df8ec37@collabora.com> (raw)
In-Reply-To: <20190827081425.15011-3-narmstrong@baylibre.com>
On Tue, 27 Aug 2019 10:14:19 +0200
Neil Armstrong <narmstrong@baylibre.com> wrote:
> Switch the dw-hdmi driver to drm_bridge_funcs, and implement the
> atomic_get_input_bus_fmts/atomic_get_output_bus_fmts.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> drivers/gpu/drm/meson/meson_dw_hdmi.c | 67 +++++++++++++++++++++------
> 1 file changed, 54 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c
> index f893ebd0b799..333583ef3ab9 100644
> --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c
> +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c
> @@ -368,7 +368,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 +663,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,15 +676,50 @@ 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 void
> +meson_venc_hdmi_encoder_get_out_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,
> + u32 *output_fmts)
> +{
> + *num_output_fmts = ARRAY_SIZE(meson_dw_hdmi_out_bus_fmts);
> +
> + if (output_fmts)
> + memcpy(output_fmts, meson_dw_hdmi_out_bus_fmts,
> + ARRAY_SIZE(meson_dw_hdmi_out_bus_fmts));
> +}
> +
> +static void
> +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)
> +{
> + if (output_fmt == meson_dw_hdmi_out_bus_fmts[0]) {
> + *num_input_fmts = 1;
> + if (input_fmts)
> + input_fmts[0] = output_fmt;
> + }
> + else
> + *num_input_fmts = 0;
nitpick:
} else {
*num_input_fmts = 0;
}
> +}
> +
> +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;
> }
This hook is optional, you don't need this stub.
Looks good otherwise:
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
>
> -static void meson_venc_hdmi_encoder_disable(struct drm_encoder *encoder)
> +static void meson_venc_hdmi_encoder_disable(struct drm_bridge *bridge)
> {
> + struct drm_encoder *encoder = bridge_to_encoder(bridge);
> struct meson_dw_hdmi *dw_hdmi = encoder_to_meson_dw_hdmi(encoder);
> struct meson_drm *priv = dw_hdmi->priv;
>
> @@ -693,8 +732,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 drm_encoder *encoder = bridge_to_encoder(bridge);
> struct meson_dw_hdmi *dw_hdmi = encoder_to_meson_dw_hdmi(encoder);
> struct meson_drm *priv = dw_hdmi->priv;
>
> @@ -706,10 +746,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 drm_encoder *encoder = bridge_to_encoder(bridge);
> struct meson_dw_hdmi *dw_hdmi = encoder_to_meson_dw_hdmi(encoder);
> struct meson_drm *priv = dw_hdmi->priv;
> int vic = drm_match_cea_mode(mode);
> @@ -726,11 +767,12 @@ 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,
> +static const struct drm_bridge_funcs meson_venc_hdmi_encoder_bridge_funcs = {
> .enable = meson_venc_hdmi_encoder_enable,
> + .disable = meson_venc_hdmi_encoder_disable,
> + .atomic_check = meson_venc_hdmi_encoder_atomic_check,
> + .atomic_get_output_bus_fmts = meson_venc_hdmi_encoder_get_out_bus_fmts,
> + .atomic_get_input_bus_fmts = meson_venc_hdmi_encoder_get_inp_bus_fmts,
> .mode_set = meson_venc_hdmi_encoder_mode_set,
> };
>
> @@ -912,8 +954,7 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master,
>
> /* Encoder */
>
> - drm_encoder_helper_add(encoder, &meson_venc_hdmi_encoder_helper_funcs);
> -
> + encoder->bridge.funcs = &meson_venc_hdmi_encoder_bridge_funcs;
> ret = drm_encoder_init(drm, encoder, &meson_venc_hdmi_encoder_funcs,
> DRM_MODE_ENCODER_TMDS, "meson_hdmi");
> if (ret) {
next prev parent reply other threads:[~2019-08-27 8:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 8:14 [PATCH RFC v2 0/8] drm/bridge: dw-hdmi: implement bus-format negotiation and YUV420 support Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 8:14 ` [PATCH RFC v2 1/8] drm/meson: venc: make drm_display_mode const Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 8:14 ` [PATCH RFC v2 2/8] drm/meson: meson_dw_hdmi: switch to drm_bridge_funcs Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 8:53 ` Boris Brezillon [this message]
2019-08-27 8:53 ` Boris Brezillon
2019-08-27 8:14 ` [PATCH RFC v2 3/8] drm/bridge: synopsys: dw-hdmi: add bus format negociation Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 9:03 ` Boris Brezillon
2019-08-27 9:03 ` Boris Brezillon
2019-08-27 10:07 ` Neil Armstrong
2019-08-27 10:07 ` Neil Armstrong
2019-08-27 8:14 ` [PATCH RFC v2 4/8] drm/meson: dw-hdmi: stop enforcing input_bus_format Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 9:05 ` Boris Brezillon
2019-08-27 9:05 ` Boris Brezillon
2019-08-27 8:14 ` [PATCH RFC v2 5/8] drm/bridge: dw-hdmi: allow ycbcr420 modes for >= 0x200a Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 8:14 ` [PATCH RFC v2 6/8] drm/meson: venc: add support for YUV420 setup Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 8:14 ` [PATCH RFC v2 7/8] drm/meson: vclk: " Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
2019-08-27 8:14 ` [PATCH RFC v2 8/8] drm/meson: Add YUV420 output support Neil Armstrong
2019-08-27 8:14 ` Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190827105327.3df8ec37@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@siol.net \
--cc=jonas@kwiboo.se \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=narmstrong@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.