Skip to content

Commit 3f07432

Browse files
Liu YingMarek Vasut
authored andcommitted
drm: lcdif: Drop unnecessary NULL pointer check on lcdif->bridge
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. Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com> Signed-off-by: Liu Ying <victor.liu@nxp.com> Reviewed-by: Marek Vasut <marex@denx.de> Signed-off-by: Marek Vasut <marex@denx.de> Link: https://patchwork.freedesktop.org/patch/msgid/20230510092450.4024730-3-victor.liu@nxp.com
1 parent fff8013 commit 3f07432

1 file changed

Lines changed: 15 additions & 21 deletions

File tree

drivers/gpu/drm/mxsfb/lcdif_kms.c

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ static void lcdif_crtc_mode_set_nofb(struct lcdif_drm_private *lcdif,
394394
struct drm_display_mode *m = &lcdif->crtc.state->adjusted_mode;
395395
u32 bus_flags = 0;
396396

397-
if (lcdif->bridge && lcdif->bridge->timings)
397+
if (lcdif->bridge->timings)
398398
bus_flags = lcdif->bridge->timings->input_bus_flags;
399399
else if (bridge_state)
400400
bus_flags = bridge_state->input_bus_cfg.flags;
@@ -463,30 +463,24 @@ static void lcdif_crtc_atomic_enable(struct drm_crtc *crtc,
463463
struct drm_display_mode *m = &lcdif->crtc.state->adjusted_mode;
464464
struct drm_bridge_state *bridge_state = NULL;
465465
struct drm_device *drm = lcdif->drm;
466-
u32 bus_format = 0;
466+
u32 bus_format;
467467
dma_addr_t paddr;
468468

469-
/* If there is a bridge attached to the LCDIF, use its bus format */
470-
if (lcdif->bridge) {
471-
bridge_state =
472-
drm_atomic_get_new_bridge_state(state,
473-
lcdif->bridge);
474-
if (!bridge_state)
475-
bus_format = MEDIA_BUS_FMT_FIXED;
476-
else
477-
bus_format = bridge_state->input_bus_cfg.format;
478-
479-
if (bus_format == MEDIA_BUS_FMT_FIXED) {
480-
dev_warn_once(drm->dev,
481-
"Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"
482-
"Please fix bridge driver by handling atomic_get_input_bus_fmts.\n");
483-
bus_format = MEDIA_BUS_FMT_RGB888_1X24;
484-
}
485-
}
469+
bridge_state = drm_atomic_get_new_bridge_state(state, lcdif->bridge);
470+
if (!bridge_state)
471+
bus_format = MEDIA_BUS_FMT_FIXED;
472+
else
473+
bus_format = bridge_state->input_bus_cfg.format;
486474

487-
/* If all else fails, default to RGB888_1X24 */
488-
if (!bus_format)
475+
if (bus_format == MEDIA_BUS_FMT_FIXED) {
476+
dev_warn_once(drm->dev,
477+
"Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"
478+
"Please fix bridge driver by handling atomic_get_input_bus_fmts.\n");
489479
bus_format = MEDIA_BUS_FMT_RGB888_1X24;
480+
} else if (!bus_format) {
481+
/* If all else fails, default to RGB888_1X24 */
482+
bus_format = MEDIA_BUS_FMT_RGB888_1X24;
483+
}
490484

491485
clk_set_rate(lcdif->clk, m->crtc_clock * 1000);
492486

0 commit comments

Comments
 (0)