From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Biju Das <biju.das.jz@bp.renesas.com>
Cc: "kieran.bingham+renesas@ideasonboard.com"
<kieran.bingham+renesas@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
"linux-media@vger.kernel.org" <linux-media@vger.kernel.org>,
"linux-renesas-soc@vger.kernel.org"
<linux-renesas-soc@vger.kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Chris Paterson <Chris.Paterson2@renesas.com>,
Biju Das <biju.das@bp.renesas.com>,
Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>
Subject: Re: [PATCH 2/2] media: v4l: vsp1: Fix uif null pointer access
Date: Tue, 16 Mar 2021 09:21:15 +0100 [thread overview]
Message-ID: <c757d90e-da85-6862-36fc-2343795de4b4@xs4all.nl> (raw)
In-Reply-To: <YE7XwWVZeOZ+HsYx@pendragon.ideasonboard.com>
On 15/03/2021 04:42, Laurent Pinchart wrote:
> Hi Biju,
>
> On Wed, Mar 10, 2021 at 02:50:23PM +0000, Biju Das wrote:
>>> On 10/03/2021 13:56, Biju Das wrote:
>>>> Thanks for the feedback.
>>>>> Subject: Re: [PATCH 2/2] media: v4l: vsp1: Fix uif null pointer
>>>>> access
>>>>>
>>>>> Hi Biju,
>>>>>
>>>>> On 01/03/2021 12:08, Biju Das wrote:
>>>>>> RZ/G2L SoC has no UIF. This patch fixes null pointer access, when
>>>>>> UIF module is not used.
>>>>>>
>>>>>> Fixes: 5e824f989e6e8("media: v4l: vsp1: Integrate DISCOM in display
>>>>>> pipeline")
>>>>>> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
>>>>>> ---
>>>>>> drivers/media/platform/vsp1/vsp1_drm.c | 4 ++--
>>>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>>
>>>>>> diff --git a/drivers/media/platform/vsp1/vsp1_drm.c
>>>>>> b/drivers/media/platform/vsp1/vsp1_drm.c
>>>>>> index f6d2f47a4058..06f74d410973 100644
>>>>>> --- a/drivers/media/platform/vsp1/vsp1_drm.c
>>>>>> +++ b/drivers/media/platform/vsp1/vsp1_drm.c
>>>>>> @@ -462,9 +462,9 @@ static int vsp1_du_pipeline_setup_inputs(struct
>>>>>> vsp1_device *vsp1,
>>>>>
>>>>>
>>>>> This looks like it complicates these conditionals more than we
>>>>> perhaps need to.
>>>>>
>>>>> What do you think about adding something above the block comment here?:
>>>>
>>>> It is much better.
>>>>
>>>> This patch is accepted in media tree[1]. So not sure, should I send a
>>>> follow up patch as optimization or drop this patch and send new one.
>>>
>>> Oh, I didn't realise these were in already. Sorry, I didn't see any review
>>> on the list, and it was the earliest I had got to them.
>>>
>>>> Please suggest.
>>>
>>> Up to you, I don't think this would get dropped now it's integrated.
>>> It's in, so if you want to update on top I believe that's fine.
>>
>> OK, Will send follow up patch as optimization.
>
> That would be nice.
>
> I don't think this patch should have been fast-tracked as a fix, as
> RZ/G2L isn't supported in mainline yet as far as I can tell.
>
> Hans, next time, could we get a notification instead of a silent merge ?
My apologies, it seemed a trivial fix, but I should have checked with you.
I jumped the gun here :-(
Regards,
Hans
>
>>>>> if (!drm_pipe->uif)
>>>>> return 0;
>>>>>
>>>>>
>>>>>> * make sure it is present in the pipeline's list of entities if it
>>>>>> * wasn't already.
>>>>>> */
>>>>>> - if (!use_uif) {
>>>>>> + if (drm_pipe->uif && !use_uif) {
>>>>>> drm_pipe->uif->pipe = NULL;
>>>>>> - } else if (!drm_pipe->uif->pipe) {
>>>>>> + } else if (drm_pipe->uif && !drm_pipe->uif->pipe) {>
>>>>> drm_pipe->uif->pipe = pipe;
>>>>>> list_add_tail(&drm_pipe->uif->list_pipe, &pipe->entities);
>>>>>> }
>>>>>>
>
next prev parent reply other threads:[~2021-03-16 8:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 12:08 [PATCH 0/2] VSP trivial enhancements Biju Das
2021-03-01 12:08 ` [PATCH 1/2] media: v4l: vsp1: Fix bru null pointer access Biju Das
2021-03-08 23:06 ` Kieran Bingham
2021-03-11 7:15 ` Biju Das
2021-03-15 3:36 ` Laurent Pinchart
2021-03-15 9:15 ` Biju Das
2021-03-15 9:27 ` Laurent Pinchart
2021-03-01 12:08 ` [PATCH 2/2] media: v4l: vsp1: Fix uif " Biju Das
2021-03-08 23:00 ` Kieran Bingham
2021-03-10 13:56 ` Biju Das
2021-03-10 14:39 ` Kieran Bingham
2021-03-10 14:50 ` Biju Das
2021-03-15 3:42 ` Laurent Pinchart
2021-03-15 8:21 ` Biju Das
2021-03-16 1:01 ` Laurent Pinchart
2021-03-16 8:21 ` Hans Verkuil [this message]
2021-03-16 21:37 ` Laurent Pinchart
-- strict thread matches above, loose matches on Subject: below --
2021-03-01 12:02 [PATCH 0/2] VSP trivial enhancements Biju Das
2021-03-01 12:02 ` [PATCH 2/2] media: v4l: vsp1: Fix uif null pointer access Biju Das
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=c757d90e-da85-6862-36fc-2343795de4b4@xs4all.nl \
--to=hverkuil-cisco@xs4all.nl \
--cc=Chris.Paterson2@renesas.com \
--cc=biju.das.jz@bp.renesas.com \
--cc=biju.das@bp.renesas.com \
--cc=geert+renesas@glider.be \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.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).