From: Biju Das <biju.das.jz@bp.renesas.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Biju Das <biju.das.jz@bp.renesas.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>,
linux-media@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: [PATCH 1/2] media: v4l: vsp1: Fix bru null pointer access
Date: Mon, 1 Mar 2021 12:08:27 +0000 [thread overview]
Message-ID: <20210301120828.6945-2-biju.das.jz@bp.renesas.com> (raw)
In-Reply-To: <20210301120828.6945-1-biju.das.jz@bp.renesas.com>
RZ/G2L SoC has only BRS. This patch fixes null pointer access,when only
BRS is enabled.
Fixes: cbb7fa49c7466("media: v4l: vsp1: Rename BRU to BRx")
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
drivers/media/platform/vsp1/vsp1_drm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
index 86d5e3f4b1ff..f6d2f47a4058 100644
--- a/drivers/media/platform/vsp1/vsp1_drm.c
+++ b/drivers/media/platform/vsp1/vsp1_drm.c
@@ -245,7 +245,7 @@ static int vsp1_du_pipeline_setup_brx(struct vsp1_device *vsp1,
brx = &vsp1->bru->entity;
else if (pipe->brx && !drm_pipe->force_brx_release)
brx = pipe->brx;
- else if (!vsp1->bru->entity.pipe)
+ else if (vsp1_feature(vsp1, VSP1_HAS_BRU) && !vsp1->bru->entity.pipe)
brx = &vsp1->bru->entity;
else
brx = &vsp1->brs->entity;
--
2.17.1
next prev parent reply other threads:[~2021-03-01 12:10 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 ` Biju Das [this message]
2021-03-08 23:06 ` [PATCH 1/2] media: v4l: vsp1: Fix bru null pointer access 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
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 1/2] media: v4l: vsp1: Fix bru 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=20210301120828.6945-2-biju.das.jz@bp.renesas.com \
--to=biju.das.jz@bp.renesas.com \
--cc=Chris.Paterson2@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).