From: khsieh@codeaurora.org
To: Stephen Boyd <swboyd@chromium.org>
Cc: Rob Clark <robdclark@gmail.com>,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Abhinav Kumar <abhinavk@codeaurora.org>,
aravindh@codeaurora.org, Sean Paul <sean@poorly.run>
Subject: Re: [PATCH 2/3] drm/msm/dp: Shrink locking area of dp_aux_transfer()
Date: Mon, 24 May 2021 09:22:43 -0700 [thread overview]
Message-ID: <d941f60adcac1cd7a55e1be252e890ae@codeaurora.org> (raw)
In-Reply-To: <20210507212505.1224111-3-swboyd@chromium.org>
On 2021-05-07 14:25, Stephen Boyd wrote:
> We don't need to hold the lock to inspect the message we're going to
> transfer, and we don't need to clear the busy flag either. Take the
> lock
> later and bail out earlier if conditions aren't met.
>
> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Cc: Abhinav Kumar <abhinavk@codeaurora.org>
> Cc: Kuogee Hsieh <khsieh@codeaurora.org>
> Cc: aravindh@codeaurora.org
> Cc: Sean Paul <sean@poorly.run>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Kuogee Hsieh <khsieh@codeaurora.org>
> ---
> drivers/gpu/drm/msm/dp/dp_aux.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c
> b/drivers/gpu/drm/msm/dp/dp_aux.c
> index 91188466cece..b49810396513 100644
> --- a/drivers/gpu/drm/msm/dp/dp_aux.c
> +++ b/drivers/gpu/drm/msm/dp/dp_aux.c
> @@ -329,30 +329,29 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux
> *dp_aux,
> ssize_t ret;
> int const aux_cmd_native_max = 16;
> int const aux_cmd_i2c_max = 128;
> - struct dp_aux_private *aux = container_of(dp_aux,
> - struct dp_aux_private, dp_aux);
> + struct dp_aux_private *aux;
>
> - mutex_lock(&aux->mutex);
> + aux = container_of(dp_aux, struct dp_aux_private, dp_aux);
>
> aux->native = msg->request & (DP_AUX_NATIVE_WRITE &
> DP_AUX_NATIVE_READ);
>
> /* Ignore address only message */
> - if ((msg->size == 0) || (msg->buffer == NULL)) {
> + if (msg->size == 0 || !msg->buffer) {
> msg->reply = aux->native ?
> DP_AUX_NATIVE_REPLY_ACK : DP_AUX_I2C_REPLY_ACK;
> - ret = msg->size;
> - goto unlock_exit;
> + return msg->size;
> }
>
> /* msg sanity check */
> - if ((aux->native && (msg->size > aux_cmd_native_max)) ||
> - (msg->size > aux_cmd_i2c_max)) {
> + if ((aux->native && msg->size > aux_cmd_native_max) ||
> + msg->size > aux_cmd_i2c_max) {
> DRM_ERROR("%s: invalid msg: size(%zu), request(%x)\n",
> __func__, msg->size, msg->request);
> - ret = -EINVAL;
> - goto unlock_exit;
> + return -EINVAL;
> }
>
> + mutex_lock(&aux->mutex);
> +
> dp_aux_update_offset_and_segment(aux, msg);
> dp_aux_transfer_helper(aux, msg, true);
next prev parent reply other threads:[~2021-05-24 16:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 21:25 [PATCH 0/3] drm/msm/dp: Simplify aux code Stephen Boyd
2021-05-07 21:25 ` [PATCH 1/3] drm/msm/dp: Simplify aux irq handling code Stephen Boyd
2021-05-24 16:22 ` khsieh
2021-05-07 21:25 ` [PATCH 2/3] drm/msm/dp: Shrink locking area of dp_aux_transfer() Stephen Boyd
2021-05-24 16:22 ` khsieh [this message]
2021-05-07 21:25 ` [PATCH 3/3] drm/msm/dp: Handle aux timeouts, nacks, defers Stephen Boyd
2021-05-24 16:33 ` khsieh
2021-05-24 19:19 ` Stephen Boyd
2021-05-24 19:57 ` khsieh
2021-05-24 19:59 ` khsieh
2021-05-21 21:57 ` [PATCH 0/3] drm/msm/dp: Simplify aux code Stephen Boyd
2021-05-21 23:26 ` khsieh
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=d941f60adcac1cd7a55e1be252e890ae@codeaurora.org \
--to=khsieh@codeaurora.org \
--cc=abhinavk@codeaurora.org \
--cc=aravindh@codeaurora.org \
--cc=dmitry.baryshkov@linaro.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=robdclark@gmail.com \
--cc=sean@poorly.run \
--cc=swboyd@chromium.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).