From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jose Abreu <Jose.Abreu@synopsys.com>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Carlos Palminha <CARLOS.PALMINHA@synopsys.com>,
Alexey Brodkin <Alexey.Brodkin@synopsys.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Dave Airlie <airlied@linux.ie>,
Andrzej Hajda <a.hajda@samsung.com>,
Archit Taneja <architt@codeaurora.org>
Subject: Re: [PATCH 2/5] drm: Use new mode_valid() helpers in connector probe helper
Date: Thu, 4 May 2017 17:32:00 +0300 [thread overview]
Message-ID: <20170504143200.GX12629@intel.com> (raw)
In-Reply-To: <bad497adb69277aa65d6727acd74328a30d986ef.1493906290.git.joabreu@synopsys.com>
On Thu, May 04, 2017 at 03:11:39PM +0100, Jose Abreu wrote:
> This changes the connector probe helper function to use the new
> encoder->mode_valid() and crtc->mode_valid() helper callbacks to
> validate the modes.
>
> The new callbacks are optional so the behaviour remains the same
> if they are not implemented. If they are, then the code loops
> through all the connector's encodersXcrtcs and calls the
> callback.
>
> If at least a valid encoderXcrtc combination is found which
> accepts the mode then the function returns MODE_OK.
>
> Signed-off-by: Jose Abreu <joabreu@synopsys.com>
> Cc: Carlos Palminha <palminha@synopsys.com>
> Cc: Alexey Brodkin <abrodkin@synopsys.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Dave Airlie <airlied@linux.ie>
> Cc: Andrzej Hajda <a.hajda@samsung.com>
> Cc: Archit Taneja <architt@codeaurora.org>
> ---
> drivers/gpu/drm/drm_probe_helper.c | 71 +++++++++++++++++++++++++++++++++++---
> 1 file changed, 67 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
> index 1b0c14a..bf19f82 100644
> --- a/drivers/gpu/drm/drm_probe_helper.c
> +++ b/drivers/gpu/drm/drm_probe_helper.c
> @@ -80,6 +80,67 @@
> return MODE_OK;
> }
>
> +static enum drm_mode_status
> +drm_mode_validate_connector(struct drm_connector *connector,
> + struct drm_display_mode *mode)
> +{
> + const struct drm_connector_helper_funcs *connector_funcs =
> + connector->helper_private;
> + struct drm_device *dev = connector->dev;
> + uint32_t *ids = connector->encoder_ids;
> + enum drm_mode_status ret = MODE_OK;
> + unsigned int i;
> +
> + /* Step 1: Validate against connector */
> + if (connector_funcs && connector_funcs->mode_valid)
> + ret = connector_funcs->mode_valid(connector, mode);
> +
> + if (ret != MODE_OK)
> + return ret;
> +
> + /* Step 2: Validate against encoders and crtcs */
> + for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
> + struct drm_encoder *encoder = drm_encoder_find(dev, ids[i]);
> + const struct drm_encoder_helper_funcs *encoder_funcs;
> + struct drm_crtc *crtc;
> +
> + if (!encoder)
> + continue;
> +
> + encoder_funcs = encoder->helper_private;
> + if (encoder_funcs && encoder_funcs->mode_valid)
> + ret = encoder_funcs->mode_valid(encoder, mode);
> + else
> + ret = MODE_OK; /* encoder accepts everything */
Since you already added the drm_bridge_mode_valid() helper, maybe add one
for connectors, encoders and crtcs as well. Might keep the logic in this
function a bit more clear on account of not having to check for the
presence of the vfunc. Right now all three cases look slightly
different from one another.
> +
> + /* No point in continuing for crtc check as this encoder will
> + * not accept the mode anyway. If all encoders reject the mode
> + * then, at exit, ret will not be MODE_OK. */
> + if (ret != MODE_OK)
> + continue;
> +
> + drm_for_each_crtc(crtc, dev) {
> + const struct drm_crtc_helper_funcs *crtc_funcs;
> +
> + if (!drm_encoder_crtc_ok(encoder, crtc))
> + continue;
> +
> + crtc_funcs = crtc->helper_private;
> + if (!crtc_funcs || !crtc_funcs->mode_valid)
> + return MODE_OK; /* crtc accepts everything */
> +
> + ret = crtc_funcs->mode_valid(crtc, mode);
> + if (ret == MODE_OK)
> + /* If we get to this point there is at least
> + * one combination of encoder+crtc that works
> + * for this mode. Lets return now. */
> + return ret;
> + }
> + }
> +
> + return ret;
> +}
> +
> static int drm_helper_probe_add_cmdline_mode(struct drm_connector *connector)
> {
> struct drm_cmdline_mode *cmdline_mode;
> @@ -283,8 +344,10 @@ void drm_kms_helper_poll_enable(struct drm_device *dev)
> * (if specified)
> * - drm_mode_validate_flag() checks the modes against basic connector
> * capabilities (interlace_allowed,doublescan_allowed,stereo_allowed)
> - * - the optional &drm_connector_helper_funcs.mode_valid helper can perform
> - * driver and/or hardware specific checks
> + * - the optional &drm_connector_helper_funcs.mode_valid,
> + * &drm_crtc_helper_funcs.mode_valid and
> + * &drm_encoder_helper_funcs.mode_valid helpers can perform driver and/or
> + * hardware specific checks
> *
> * 5. Any mode whose status is not OK is pruned from the connector's modes list,
> * accompanied by a debug message indicating the reason for the mode's
> @@ -428,8 +491,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
> if (mode->status == MODE_OK)
> mode->status = drm_mode_validate_flag(mode, mode_flags);
>
> - if (mode->status == MODE_OK && connector_funcs->mode_valid)
> - mode->status = connector_funcs->mode_valid(connector,
> + if (mode->status == MODE_OK)
> + mode->status = drm_mode_validate_connector(connector,
> mode);
> }
>
> --
> 1.9.1
>
--
Ville Syrjälä
Intel OTC
next prev parent reply other threads:[~2017-05-04 14:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-04 14:11 [PATCH 0/5] Introduce new mode validation callbacks Jose Abreu
2017-05-04 14:11 ` [PATCH 1/5] drm: Add crtc/encoder/bridge->mode_valid() callbacks Jose Abreu
2017-05-08 7:52 ` Daniel Vetter
2017-05-04 14:11 ` [PATCH 2/5] drm: Use new mode_valid() helpers in connector probe helper Jose Abreu
2017-05-04 14:32 ` Ville Syrjälä [this message]
2017-05-04 14:53 ` Jose Abreu
2017-05-08 7:50 ` Daniel Vetter
2017-05-08 10:13 ` Jose Abreu
2017-05-08 18:28 ` Daniel Vetter
2017-05-04 14:11 ` [PATCH 3/5] drm: Introduce drm_bridge_mode_valid() Jose Abreu
2017-05-04 14:11 ` [PATCH 4/5] drm: Use mode_valid() in atomic modeset Jose Abreu
2017-05-04 14:40 ` Ville Syrjälä
2017-05-04 15:13 ` Jose Abreu
2017-05-08 7:55 ` Daniel Vetter
2017-05-04 14:11 ` [PATCH 5/5] drm: arc: Use crtc->mode_valid() callback Jose Abreu
2017-05-08 7:58 ` [PATCH 0/5] Introduce new mode validation callbacks Daniel Vetter
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=20170504143200.GX12629@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=Alexey.Brodkin@synopsys.com \
--cc=CARLOS.PALMINHA@synopsys.com \
--cc=Jose.Abreu@synopsys.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=architt@codeaurora.org \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.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).