From: Neil Armstrong <narmstrong@baylibre.com>
To: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
dri-devel@lists.freedesktop.org
Cc: linux-renesas-soc@vger.kernel.org,
Andrzej Hajda <a.hajda@samsung.com>,
Jernej Skrabec <jernej.skrabec@siol.net>,
Jonas Karlman <jonas@kwiboo.se>, Sam Ravnborg <sam@ravnborg.org>,
Kieran Bingham <kieran.bingham@ideasonboard.com>
Subject: Re: [PATCH 21/27] drm: bridge: dw-hdmi: Pass drm_connector to internal functions as needed
Date: Tue, 26 May 2020 14:29:45 +0200 [thread overview]
Message-ID: <235cc8f1-bfba-cf3a-50f0-f6d1b977e9fb@baylibre.com> (raw)
In-Reply-To: <20200526011505.31884-22-laurent.pinchart+renesas@ideasonboard.com>
On 26/05/2020 03:14, Laurent Pinchart wrote:
> To prepare for making connector creation optional in the driver, pass
> the drm_connector explicitly to the internal functions that require it.
> The functions that still access the connector from the dw_hdmi structure
> are dw_hdmi_connector_create() and __dw_hdmi_probe(). The former access
> is expected, as that's where the internal connector is created. The
> latter will be addressed separately.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 31 +++++++++++++----------
> 1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index 16bffedb4715..b69c14b9de62 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -1632,18 +1632,17 @@ static void hdmi_tx_hdcp_config(struct dw_hdmi *hdmi)
> }
>
> static void hdmi_config_AVI(struct dw_hdmi *hdmi,
> + const struct drm_connector *connector,
> const struct drm_display_mode *mode)
> {
> struct hdmi_avi_infoframe frame;
> u8 val;
>
> /* Initialise info frame from DRM mode */
> - drm_hdmi_avi_infoframe_from_display_mode(&frame,
> - &hdmi->connector, mode);
> + drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
>
> if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) {
> - drm_hdmi_avi_infoframe_quant_range(&frame, &hdmi->connector,
> - mode,
> + drm_hdmi_avi_infoframe_quant_range(&frame, connector, mode,
> hdmi->hdmi_data.rgb_limited_range ?
> HDMI_QUANTIZATION_RANGE_LIMITED :
> HDMI_QUANTIZATION_RANGE_FULL);
> @@ -1760,14 +1759,14 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi,
> }
>
> static void hdmi_config_vendor_specific_infoframe(struct dw_hdmi *hdmi,
> + const struct drm_connector *connector,
> const struct drm_display_mode *mode)
> {
> struct hdmi_vendor_infoframe frame;
> u8 buffer[10];
> ssize_t err;
>
> - err = drm_hdmi_vendor_infoframe_from_display_mode(&frame,
> - &hdmi->connector,
> + err = drm_hdmi_vendor_infoframe_from_display_mode(&frame, connector,
> mode);
> if (err < 0)
> /*
> @@ -1813,9 +1812,10 @@ static void hdmi_config_vendor_specific_infoframe(struct dw_hdmi *hdmi,
> HDMI_FC_DATAUTO0_VSD_MASK);
> }
>
> -static void hdmi_config_drm_infoframe(struct dw_hdmi *hdmi)
> +static void hdmi_config_drm_infoframe(struct dw_hdmi *hdmi,
> + const struct drm_connector *connector)
> {
> - const struct drm_connector_state *conn_state = hdmi->connector.state;
> + const struct drm_connector_state *conn_state = connector->state;
> struct hdmi_drm_infoframe frame;
> u8 buffer[30];
> ssize_t err;
> @@ -2118,9 +2118,9 @@ static void hdmi_disable_overflow_interrupts(struct dw_hdmi *hdmi)
> }
>
> static int dw_hdmi_setup(struct dw_hdmi *hdmi,
> + const struct drm_connector *connector,
> const struct drm_display_mode *mode)
> {
> - struct drm_connector *connector = &hdmi->connector;
> int ret;
>
> hdmi_disable_overflow_interrupts(hdmi);
> @@ -2192,9 +2192,9 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi,
> dev_dbg(hdmi->dev, "%s HDMI mode\n", __func__);
>
> /* HDMI Initialization Step F - Configure AVI InfoFrame */
> - hdmi_config_AVI(hdmi, mode);
> - hdmi_config_vendor_specific_infoframe(hdmi, mode);
> - hdmi_config_drm_infoframe(hdmi);
> + hdmi_config_AVI(hdmi, connector, mode);
> + hdmi_config_vendor_specific_infoframe(hdmi, connector, mode);
> + hdmi_config_drm_infoframe(hdmi, connector);
> } else {
> dev_dbg(hdmi->dev, "%s DVI mode\n", __func__);
> }
> @@ -2263,7 +2263,12 @@ static void initialize_hdmi_ih_mutes(struct dw_hdmi *hdmi)
> static void dw_hdmi_poweron(struct dw_hdmi *hdmi)
> {
> hdmi->bridge_is_on = true;
> - dw_hdmi_setup(hdmi, &hdmi->previous_mode);
> +
> + /*
> + * The curr_conn field is guaranteed to be valid here, as this function
> + * is only be called when !hdmi->disabled.
> + */
> + dw_hdmi_setup(hdmi, hdmi->curr_conn, &hdmi->previous_mode);
> }
>
> static void dw_hdmi_poweroff(struct dw_hdmi *hdmi)
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
next prev parent reply other threads:[~2020-05-26 12:29 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 1:14 [PATCH 00/27] Converter R-Car DU to the DRM bridge connector helper Laurent Pinchart
2020-05-26 1:14 ` [PATCH 01/27] drm: bridge: adv7511: Split EDID read to a separate function Laurent Pinchart
2020-05-26 1:14 ` [PATCH 02/27] drm: bridge: adv7511: Split connector creation " Laurent Pinchart
2020-05-26 1:14 ` [PATCH 03/27] drm: bridge: adv7511: Implement bridge connector operations Laurent Pinchart
2020-06-21 8:25 ` Sam Ravnborg
2020-05-26 1:14 ` [PATCH 04/27] drm: bridge: adv7511: Make connector creation optional Laurent Pinchart
2020-05-26 1:14 ` [PATCH 05/27] drm: bridge: Return NULL on error from drm_bridge_get_edid() Laurent Pinchart
2020-06-21 8:26 ` Sam Ravnborg
2020-05-26 1:14 ` [PATCH 06/27] drm: bridge: simple-bridge: Delegate operations to next bridge Laurent Pinchart
2020-05-26 1:14 ` [PATCH 07/27] drm: bridge: simple-bridge: Make connector creation optional Laurent Pinchart
2020-05-26 1:14 ` [PATCH 08/27] drm: rcar-du: lvds: Convert to DRM panel bridge helper Laurent Pinchart
2020-05-26 1:14 ` [PATCH 09/27] drm: edid: Constify connector argument to infoframe functions Laurent Pinchart
2020-06-21 8:27 ` Sam Ravnborg
2020-05-26 1:14 ` [PATCH 10/27] drm: bridge: Pass drm_display_info to drm_bridge_funcs .mode_valid() Laurent Pinchart
2020-05-26 12:51 ` Neil Armstrong
2020-05-26 12:59 ` Boris Brezillon
2020-05-26 14:05 ` Guido Günther
2020-05-26 1:14 ` [PATCH 11/27] drm: bridge: dw-hdmi: Pass private data pointer to .mode_valid() Laurent Pinchart
2020-05-26 9:44 ` Neil Armstrong
2020-05-26 1:14 ` [PATCH 12/27] drm: bridge: dw-hdmi: Pass private data pointer to .configure_phy() Laurent Pinchart
2020-05-26 9:45 ` Neil Armstrong
2020-05-26 1:14 ` [PATCH 13/27] drm: bridge: dw-hdmi: Remove unused field from dw_hdmi_plat_data Laurent Pinchart
2020-05-26 9:45 ` Neil Armstrong
2020-05-26 1:14 ` [PATCH 14/27] drm: meson: dw-hdmi: Use dw_hdmi context to replace hack Laurent Pinchart
2020-05-26 12:32 ` Neil Armstrong
2020-05-26 1:14 ` [PATCH 15/27] drm: bridge: dw-hdmi: Pass drm_display_info to .mode_valid() Laurent Pinchart
2020-05-26 9:46 ` Neil Armstrong
2020-05-26 1:14 ` [PATCH 16/27] drm: bridge: dw-hdmi: Constify mode argument to dw_hdmi_phy_ops .init() Laurent Pinchart
2020-05-26 9:46 ` Neil Armstrong
2020-05-26 1:14 ` [PATCH 17/27] drm: bridge: dw-hdmi: Constify mode argument to internal functions Laurent Pinchart
2020-05-26 9:46 ` Neil Armstrong
2020-05-26 1:14 ` [PATCH 18/27] drm: bridge: dw-hdmi: Pass drm_display_info to dw_hdmi_support_scdc() Laurent Pinchart
2020-05-26 9:48 ` Neil Armstrong
2020-05-26 1:14 ` [PATCH 19/27] drm: bridge: dw-hdmi: Split connector creation to a separate function Laurent Pinchart
2020-05-26 9:49 ` Neil Armstrong
2020-05-26 1:14 ` [PATCH 20/27] drm: bridge: dw-hdmi: Store current connector in struct dw_hdmi Laurent Pinchart
2020-05-26 12:29 ` Neil Armstrong
2020-05-26 1:14 ` [PATCH 21/27] drm: bridge: dw-hdmi: Pass drm_connector to internal functions as needed Laurent Pinchart
2020-05-26 12:29 ` Neil Armstrong [this message]
2020-05-26 1:15 ` [PATCH 22/27] drm: bridge: dw-hdmi: Make connector creation optional Laurent Pinchart
2020-05-26 12:35 ` Neil Armstrong
2020-06-07 1:19 ` Laurent Pinchart
2020-05-26 1:15 ` [PATCH 23/27] drm: bridge: dw-hdmi: Attach to next bridge if available Laurent Pinchart
2020-05-26 12:50 ` Neil Armstrong
2020-05-26 14:23 ` Jonas Karlman
2020-06-07 1:24 ` Laurent Pinchart
2020-06-07 1:22 ` Laurent Pinchart
2020-05-26 1:15 ` [PATCH 24/27] drm: rcar-du: dw-hdmi: Set output port number Laurent Pinchart
2020-05-26 1:15 ` [PATCH 25/27] drm: rcar-du: Fix error handling in rcar_du_encoder_init() Laurent Pinchart
2020-05-26 1:15 ` [PATCH 26/27] drm: rcar-du: Use drm_bridge_connector_init() helper Laurent Pinchart
2020-05-26 1:15 ` [PATCH 27/27] drm: Add default modes for connectors in unknown state Laurent Pinchart
2020-06-21 8:40 ` Sam Ravnborg
2020-06-24 1:12 ` Laurent Pinchart
2020-06-24 7:23 ` Daniel Vetter
2020-06-24 15:24 ` Alex Deucher
2020-06-24 19:31 ` Daniel Vetter
2020-06-24 19:40 ` Alex Deucher
2020-06-25 7:56 ` Daniel Vetter
2020-06-25 7:57 ` Daniel Vetter
2020-06-25 10:31 ` Pekka Paalanen
2020-06-25 10:44 ` Daniel Vetter
2020-06-26 8:59 ` Pekka Paalanen
2020-06-26 9:25 ` Daniel Stone
2020-06-26 13:35 ` Daniel Vetter
2020-06-24 22:47 ` Laurent Pinchart
2020-06-23 18:55 ` [PATCH 00/27] Converter R-Car DU to the DRM bridge connector helper Sam Ravnborg
2020-06-25 8:48 ` Liu Ying
2020-06-27 19:55 ` Sam Ravnborg
2020-06-28 8:28 ` Laurent Pinchart
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=235cc8f1-bfba-cf3a-50f0-f6d1b977e9fb@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=a.hajda@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@siol.net \
--cc=jonas@kwiboo.se \
--cc=kieran.bingham@ideasonboard.com \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=sam@ravnborg.org \
/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 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).