Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'drm-misc-next-fixes-2026-01-29' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
Two fixes for NULL pointer dereference in imx8 following the bridge
refcounting conversions, and one for the bridge connector following the
HDMI audio reworks.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patch.msgid.link/20260129-efficient-jerboa-of-ecstasy-822832@houat
+14
-5
+5
-2
drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c
+5
-2
drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c
···
65
65
static void imx8qxp_ldb_bridge_destroy(struct drm_bridge *bridge)
66
66
{
67
67
struct ldb_channel *ldb_ch = bridge->driver_private;
68
-
struct ldb *ldb = ldb_ch->ldb;
69
-
struct imx8qxp_ldb *imx8qxp_ldb = base_to_imx8qxp_ldb(ldb);
68
+
struct imx8qxp_ldb *imx8qxp_ldb;
70
69
70
+
if (!ldb_ch)
71
+
return;
72
+
73
+
imx8qxp_ldb = base_to_imx8qxp_ldb(ldb_ch->ldb);
71
74
drm_bridge_put(imx8qxp_ldb->companion);
72
75
}
73
76
+3
drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
+3
drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c
+6
-3
drivers/gpu/drm/display/drm_bridge_connector.c
+6
-3
drivers/gpu/drm/display/drm_bridge_connector.c
···
851
851
!bridge->funcs->hdmi_clear_hdmi_infoframe)
852
852
return ERR_PTR(-EINVAL);
853
853
854
+
if (bridge->ops & DRM_BRIDGE_OP_HDMI_AUDIO &&
855
+
(!bridge->funcs->hdmi_write_audio_infoframe ||
856
+
!bridge->funcs->hdmi_clear_audio_infoframe))
857
+
return ERR_PTR(-EINVAL);
858
+
854
859
if (bridge->ops & DRM_BRIDGE_OP_HDMI_HDR_DRM_INFOFRAME &&
855
860
(!bridge->funcs->hdmi_write_hdr_drm_infoframe ||
856
861
!bridge->funcs->hdmi_clear_hdr_drm_infoframe))
···
885
880
!bridge->hdmi_audio_spdif_playback)
886
881
return ERR_PTR(-EINVAL);
887
882
888
-
if (!bridge->funcs->hdmi_write_audio_infoframe ||
889
-
!bridge->funcs->hdmi_clear_audio_infoframe ||
890
-
!bridge->funcs->hdmi_audio_prepare ||
883
+
if (!bridge->funcs->hdmi_audio_prepare ||
891
884
!bridge->funcs->hdmi_audio_shutdown)
892
885
return ERR_PTR(-EINVAL);
893
886