From: Abhinav Kumar <quic_abhinavk@quicinc.com>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Nathan Chancellor <nathan@kernel.org>,
Nathan Huckleberry <nhuck@google.com>
Cc: Dan Carpenter <error27@gmail.com>, <llvm@lists.linux.dev>,
Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Nick Desaulniers <ndesaulniers@google.com>,
Tom Rix <trix@redhat.com>, <linux-arm-msm@vger.kernel.org>,
<dri-devel@lists.freedesktop.org>,
<freedreno@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] drm/msm: Fix return type of mdp4_lvds_connector_mode_valid
Date: Mon, 31 Oct 2022 17:26:52 -0700 [thread overview]
Message-ID: <8b1da0e8-4c8d-2fb8-9c7c-58b56f4bdf0a@quicinc.com> (raw)
In-Reply-To: <1c735bcc-d4f7-333f-58a5-e3f463bab10d@linaro.org>
On 10/31/2022 5:24 PM, Dmitry Baryshkov wrote:
> On 01/11/2022 01:10, Nathan Chancellor wrote:
>> On Tue, Sep 13, 2022 at 01:55:48PM -0700, Nathan Huckleberry wrote:
>>> The mode_valid field in drm_connector_helper_funcs is expected to be of
>>> type:
>>> enum drm_mode_status (* mode_valid) (struct drm_connector *connector,
>>> struct drm_display_mode *mode);
>>>
>>> The mismatched return type breaks forward edge kCFI since the underlying
>>> function definition does not match the function hook definition.
>>>
>>> The return type of mdp4_lvds_connector_mode_valid should be changed from
>>> int to enum drm_mode_status.
>>>
>>> Reported-by: Dan Carpenter <error27@gmail.com>
>>> Link: https://github.com/ClangBuiltLinux/linux/issues/1703
>>> Cc: llvm@lists.linux.dev
>>> Signed-off-by: Nathan Huckleberry <nhuck@google.com>
>>> ---
>>> drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 5 +++--
>>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
>>> b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
>>> index 7288041dd86a..7444b75c4215 100644
>>> --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
>>> +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
>>> @@ -56,8 +56,9 @@ static int mdp4_lvds_connector_get_modes(struct
>>> drm_connector *connector)
>>> return ret;
>>> }
>>> -static int mdp4_lvds_connector_mode_valid(struct drm_connector
>>> *connector,
>>> - struct drm_display_mode *mode)
>>> +static enum drm_mode_status
>>> +mdp4_lvds_connector_mode_valid(struct drm_connector *connector,
>>> + struct drm_display_mode *mode)
>>> {
>>> struct mdp4_lvds_connector *mdp4_lvds_connector =
>>> to_mdp4_lvds_connector(connector);
>>> --
>>> 2.37.2.789.g6183377224-goog
>>>
>>>
>>
>> Did this patch get lost somewhere? I do not see it picked up. It is
>> needed to avoid a new WIP warning from clang for catching these CFI
>> failures:
>>
>> drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c:89:16: error:
>> incompatible function pointer types initializing 'enum drm_mode_status
>> (*)(struct drm_connector *, struct drm_display_mode *)' with an
>> expression of type 'int (struct drm_connector *, struct
>> drm_display_mode *)'
>> [-Werror,-Wincompatible-function-pointer-types-strict]
>> .mode_valid = mdp4_lvds_connector_mode_valid,
>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> 1 error generated.
>
> It will be picked into 6.1-rc and then propagate through the stable
> kernel updates.
>
> Anyway:
>
> Fixes: 3e87599b68e7 ("drm/msm/mdp4: add LVDS panel support")
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Yes, it was already merged to the -fixes tree and a PR with it was sent
out for 6.1-rc
https://gitlab.freedesktop.org/drm/msm/-/commit/0b33a33bd15d5bab73b87152b220a8d0153a4587
>
>
prev parent reply other threads:[~2022-11-01 0:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-13 20:55 [PATCH] drm/msm: Fix return type of mdp4_lvds_connector_mode_valid Nathan Huckleberry
2022-09-13 23:01 ` [Freedreno] " Abhinav Kumar
2022-09-13 23:19 ` Nathan Chancellor
2022-10-31 22:10 ` Nathan Chancellor
2022-11-01 0:24 ` Dmitry Baryshkov
2022-11-01 0:26 ` Abhinav Kumar [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=8b1da0e8-4c8d-2fb8-9c7c-58b56f4bdf0a@quicinc.com \
--to=quic_abhinavk@quicinc.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=error27@gmail.com \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nhuck@google.com \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
--cc=trix@redhat.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).