diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-02-04 14:43:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-02-04 14:43:35 +1000 |
| commit | 8ea2c5187d7b4901a70374415e772f1db422fb74 (patch) | |
| tree | d96d3e0ef476970fa39b47d3e28c425d146750bd /drivers/gpu/drm/mxsfb/mxsfb_kms.c | |
| parent | 7eb3848cc8c17a822f4cced5da0aa437e0063097 (diff) | |
| parent | 622c9a3a7868e1eeca39c55305ca3ebec4742b64 (diff) | |
Merge tag 'drm-misc-fixes-2022-02-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
* dma-buf/heaps: Fix potential spectre v1 gadget
* drm/kmb: Fix potential out-of-bounds access
* drm/mxsfb: Fix NULL-pointer dereference
* drm/nouveau: Fix potential out-of-bounds access in BIOS decoding
* fbdev: Re-add support for fbcon hardware acceleration
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Yfu8mTZQUNt1RwZd@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/mxsfb/mxsfb_kms.c')
| -rw-r--r-- | drivers/gpu/drm/mxsfb/mxsfb_kms.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c index 0655582ae8ed..4cfb6c001679 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c @@ -361,7 +361,11 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc, bridge_state = drm_atomic_get_new_bridge_state(state, mxsfb->bridge); - bus_format = bridge_state->input_bus_cfg.format; + 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" |