From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Douglas Anderson <dianders@chromium.org>,
dri-devel@lists.freedesktop.org
Cc: freedreno@lists.freedesktop.org, swboyd@chromium.org,
quic_khsieh@quicinc.com, quic_sbillaka@quicinc.com,
quic_abhinavk@quicinc.com, ville.syrjala@linux.intel.com,
quic_aravindh@quicinc.com, tzimmermann@suse.de,
robdclark@gmail.com, linux-arm-msm@vger.kernel.org,
Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@linux.ie>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 1/2] drm/probe-helper: Add helper for drm_helper_probe_single_connector_modes()
Date: Wed, 1 Jun 2022 23:36:21 +0300 [thread overview]
Message-ID: <10e79606-65d7-73bc-34e1-92ed5740d8fc@linaro.org> (raw)
In-Reply-To: <20220511155749.v3.1.I2dd93486c6952bd52f2020904de0133970d11b29@changeid>
On 12/05/2022 01:58, Douglas Anderson wrote:
> The drm_helper_probe_single_connector_modes() is a bit long. Let's
> break a chunk off to update and validate modes. This helps avoid one
> goto and also will allow us to more easily call the helper a second
> time in a future patch without adding looping or another goto.
>
> This change is intended to be a no-op change--just code movement.
>
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>
> Changes in v3:
> - Removed WARN_ON
>
> Changes in v2:
> - Two underscores for __drm_helper_update_and_validate().
> - Return err and use WARN_ON instead of returning a bool.
>
> drivers/gpu/drm/drm_probe_helper.c | 106 ++++++++++++++++-------------
> 1 file changed, 60 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
> index 682359512996..2570d47e7eab 100644
> --- a/drivers/gpu/drm/drm_probe_helper.c
> +++ b/drivers/gpu/drm/drm_probe_helper.c
> @@ -354,6 +354,61 @@ drm_helper_probe_detect(struct drm_connector *connector,
> }
> EXPORT_SYMBOL(drm_helper_probe_detect);
>
> +static int __drm_helper_update_and_validate(struct drm_connector *connector,
> + uint32_t maxX, uint32_t maxY,
> + struct drm_modeset_acquire_ctx *ctx)
> +{
> + struct drm_device *dev = connector->dev;
> + struct drm_display_mode *mode;
> + int mode_flags = 0;
> + int ret;
> +
> + drm_connector_list_update(connector);
> +
> + if (connector->interlace_allowed)
> + mode_flags |= DRM_MODE_FLAG_INTERLACE;
> + if (connector->doublescan_allowed)
> + mode_flags |= DRM_MODE_FLAG_DBLSCAN;
> + if (connector->stereo_allowed)
> + mode_flags |= DRM_MODE_FLAG_3D_MASK;
> +
> + list_for_each_entry(mode, &connector->modes, head) {
> + if (mode->status != MODE_OK)
> + continue;
> +
> + mode->status = drm_mode_validate_driver(dev, mode);
> + if (mode->status != MODE_OK)
> + continue;
> +
> + mode->status = drm_mode_validate_size(mode, maxX, maxY);
> + if (mode->status != MODE_OK)
> + continue;
> +
> + mode->status = drm_mode_validate_flag(mode, mode_flags);
> + if (mode->status != MODE_OK)
> + continue;
> +
> + ret = drm_mode_validate_pipeline(mode, connector, ctx,
> + &mode->status);
> + if (ret) {
> + drm_dbg_kms(dev,
> + "drm_mode_validate_pipeline failed: %d\n",
> + ret);
> +
> + if (drm_WARN_ON_ONCE(dev, ret != -EDEADLK))
> + mode->status = MODE_ERROR;
> + else
> + return -EDEADLK;
> + }
> +
> + if (mode->status != MODE_OK)
> + continue;
> + mode->status = drm_mode_validate_ycbcr420(mode, connector);
> + }
> +
> + return 0;
> +}
> +
> /**
> * drm_helper_probe_single_connector_modes - get complete set of display modes
> * @connector: connector to probe
> @@ -421,7 +476,6 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
> const struct drm_connector_helper_funcs *connector_funcs =
> connector->helper_private;
> int count = 0, ret;
> - int mode_flags = 0;
> bool verbose_prune = true;
> enum drm_connector_status old_status;
> struct drm_modeset_acquire_ctx ctx;
> @@ -519,52 +573,12 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
> connector->status == connector_status_unknown))
> count = drm_add_modes_noedid(connector, 1024, 768);
> count += drm_helper_probe_add_cmdline_mode(connector);
> - if (count == 0)
> - goto prune;
> -
> - drm_connector_list_update(connector);
> -
> - if (connector->interlace_allowed)
> - mode_flags |= DRM_MODE_FLAG_INTERLACE;
> - if (connector->doublescan_allowed)
> - mode_flags |= DRM_MODE_FLAG_DBLSCAN;
> - if (connector->stereo_allowed)
> - mode_flags |= DRM_MODE_FLAG_3D_MASK;
> -
> - list_for_each_entry(mode, &connector->modes, head) {
> - if (mode->status != MODE_OK)
> - continue;
> -
> - mode->status = drm_mode_validate_driver(dev, mode);
> - if (mode->status != MODE_OK)
> - continue;
> -
> - mode->status = drm_mode_validate_size(mode, maxX, maxY);
> - if (mode->status != MODE_OK)
> - continue;
> -
> - mode->status = drm_mode_validate_flag(mode, mode_flags);
> - if (mode->status != MODE_OK)
> - continue;
> -
> - ret = drm_mode_validate_pipeline(mode, connector, &ctx,
> - &mode->status);
> - if (ret) {
> - drm_dbg_kms(dev,
> - "drm_mode_validate_pipeline failed: %d\n",
> - ret);
> -
> - if (drm_WARN_ON_ONCE(dev, ret != -EDEADLK)) {
> - mode->status = MODE_ERROR;
> - } else {
> - drm_modeset_backoff(&ctx);
> - goto retry;
> - }
> + if (count != 0) {
> + ret = __drm_helper_update_and_validate(connector, maxX, maxY, &ctx);
> + if (ret == -EDEADLK) {
> + drm_modeset_backoff(&ctx);
> + goto retry;
> }
> -
> - if (mode->status != MODE_OK)
> - continue;
> - mode->status = drm_mode_validate_ycbcr420(mode, connector);
> }
>
> prune:
--
With best wishes
Dmitry
prev parent reply other threads:[~2022-06-01 20:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-11 22:58 [PATCH v3 1/2] drm/probe-helper: Add helper for drm_helper_probe_single_connector_modes() Douglas Anderson
2022-05-11 22:58 ` [PATCH v3 2/2] drm/probe-helper: For DP, add 640x480 if all other modes are bad Douglas Anderson
2022-05-20 0:21 ` Doug Anderson
2022-05-20 0:20 ` [PATCH v3 1/2] drm/probe-helper: Add helper for drm_helper_probe_single_connector_modes() Doug Anderson
2022-06-01 20:36 ` Dmitry Baryshkov [this message]
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=10e79606-65d7-73bc-34e1-92ed5740d8fc@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_aravindh@quicinc.com \
--cc=quic_khsieh@quicinc.com \
--cc=quic_sbillaka@quicinc.com \
--cc=robdclark@gmail.com \
--cc=swboyd@chromium.org \
--cc=tzimmermann@suse.de \
--cc=ville.syrjala@linux.intel.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 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).