From: Liu Ying <victor.liu@nxp.com>
To: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Cc: marex@denx.de, alexander.stein@ew.tq-group.com,
shawnguo@kernel.org, s.hauer@pengutronix.de,
krzysztof.kozlowski@linaro.org, robh+dt@kernel.org,
linux-imx@nxp.com, krzysztof.kozlowski+dt@linaro.org,
kernel@pengutronix.de, LW@karo-electronics.de
Subject: [PATCH v4 2/6] drm: lcdif: Drop unnecessary NULL pointer check on lcdif->bridge
Date: Fri, 17 Feb 2023 14:54:03 +0800 [thread overview]
Message-ID: <20230217065407.2259731-3-victor.liu@nxp.com> (raw)
In-Reply-To: <20230217065407.2259731-1-victor.liu@nxp.com>
A valid bridge is already found in lcdif_attach_bridge() and set
to lcdif->bridge, so lcdif->bridge cannot be a NULL pointer. Drop
the unnecessary NULL pointer check in KMS stage.
Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Liu Ying <victor.liu@nxp.com>
---
v3->v4:
* Add Alexander's R-b tag.
v2->v3:
* No change.
v1->v2:
* Split from patch 2/2 in v1. (Marek, Alexander)
drivers/gpu/drm/mxsfb/lcdif_kms.c | 33 +++++++++++--------------------
1 file changed, 12 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/mxsfb/lcdif_kms.c b/drivers/gpu/drm/mxsfb/lcdif_kms.c
index 262bc43b1079..e54200a9fcb9 100644
--- a/drivers/gpu/drm/mxsfb/lcdif_kms.c
+++ b/drivers/gpu/drm/mxsfb/lcdif_kms.c
@@ -394,7 +394,7 @@ static void lcdif_crtc_mode_set_nofb(struct lcdif_drm_private *lcdif,
struct drm_display_mode *m = &lcdif->crtc.state->adjusted_mode;
u32 bus_flags = 0;
- if (lcdif->bridge && lcdif->bridge->timings)
+ if (lcdif->bridge->timings)
bus_flags = lcdif->bridge->timings->input_bus_flags;
else if (bridge_state)
bus_flags = bridge_state->input_bus_cfg.flags;
@@ -463,30 +463,21 @@ static void lcdif_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_display_mode *m = &lcdif->crtc.state->adjusted_mode;
struct drm_bridge_state *bridge_state = NULL;
struct drm_device *drm = lcdif->drm;
- u32 bus_format = 0;
+ u32 bus_format;
dma_addr_t paddr;
- /* If there is a bridge attached to the LCDIF, use its bus format */
- if (lcdif->bridge) {
- bridge_state =
- drm_atomic_get_new_bridge_state(state,
- lcdif->bridge);
- if (!bridge_state)
- bus_format = MEDIA_BUS_FMT_FIXED;
- else
- bus_format = bridge_state->input_bus_cfg.format;
-
- if (bus_format == MEDIA_BUS_FMT_FIXED) {
- dev_warn_once(drm->dev,
- "Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"
- "Please fix bridge driver by handling atomic_get_input_bus_fmts.\n");
- bus_format = MEDIA_BUS_FMT_RGB888_1X24;
- }
- }
+ bridge_state = drm_atomic_get_new_bridge_state(state, lcdif->bridge);
+ if (!bridge_state)
+ bus_format = MEDIA_BUS_FMT_FIXED;
+ else
+ bus_format = bridge_state->input_bus_cfg.format;
- /* If all else fails, default to RGB888_1X24 */
- if (!bus_format)
+ if (bus_format == MEDIA_BUS_FMT_FIXED) {
+ dev_warn_once(drm->dev,
+ "Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"
+ "Please fix bridge driver by handling atomic_get_input_bus_fmts.\n");
bus_format = MEDIA_BUS_FMT_RGB888_1X24;
+ }
clk_set_rate(lcdif->clk, m->crtc_clock * 1000);
--
2.37.1
next prev parent reply other threads:[~2023-02-17 6:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 6:54 [PATCH v4 0/6] drm: lcdif: Add i.MX93 LCDIF support Liu Ying
2023-02-17 6:54 ` [PATCH v4 1/6] dt-bindings: " Liu Ying
2023-02-17 6:54 ` Liu Ying [this message]
2023-02-17 6:54 ` [PATCH v4 3/6] drm: lcdif: Determine bus format and flags in ->atomic_check() Liu Ying
2023-02-17 8:09 ` Alexander Stein
2023-02-17 6:54 ` [PATCH v4 4/6] drm: lcdif: Check consistent bus format and flags across first bridges Liu Ying
2023-02-17 8:10 ` Alexander Stein
2023-02-17 6:54 ` [PATCH v4 5/6] drm: lcdif: Add multiple encoders and first bridges support Liu Ying
2023-02-17 8:12 ` Alexander Stein
2023-02-17 6:54 ` [PATCH v4 6/6] drm: lcdif: Add i.MX93 LCDIF compatible string Liu Ying
2023-02-17 8:18 ` [PATCH v4 0/6] drm: lcdif: Add i.MX93 LCDIF support Alexander Stein
2023-02-17 8:59 ` Liu Ying
2023-02-20 8:55 ` Alexander Stein
2023-02-20 10:16 ` Alexander Stein
2023-02-20 12:46 ` Liu Ying
2023-02-20 12:18 ` Rasmus Villemoes
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=20230217065407.2259731-3-victor.liu@nxp.com \
--to=victor.liu@nxp.com \
--cc=LW@karo-electronics.de \
--cc=alexander.stein@ew.tq-group.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marex@denx.de \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.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).