mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 05:31:37 -04:00
Merge tag 'drm-misc-next-fixes-2026-04-23' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
Short summary of fixes pull: rcar-du: - fix NULL-ptr crash Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patch.msgid.link/20260423130852.GA114622@linux.fritz.box
This commit is contained in:
@@ -513,7 +513,7 @@ static void rcar_du_cmm_setup(struct drm_crtc *crtc)
|
||||
struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
|
||||
struct rcar_cmm_config cmm_config = {};
|
||||
|
||||
if (!rcrtc->cmm->dev)
|
||||
if (!rcrtc->cmm)
|
||||
return;
|
||||
|
||||
if (drm_lut)
|
||||
@@ -667,7 +667,7 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc)
|
||||
if (rcar_du_has(rcrtc->dev, RCAR_DU_FEATURE_VSP1_SOURCE))
|
||||
rcar_du_vsp_disable(rcrtc);
|
||||
|
||||
if (rcrtc->cmm->dev)
|
||||
if (rcrtc->cmm)
|
||||
rcar_cmm_disable(rcrtc->cmm->dev);
|
||||
|
||||
/*
|
||||
@@ -726,7 +726,7 @@ static void rcar_du_crtc_atomic_enable(struct drm_crtc *crtc,
|
||||
struct rcar_du_crtc_state *rstate = to_rcar_crtc_state(crtc->state);
|
||||
struct rcar_du_device *rcdu = rcrtc->dev;
|
||||
|
||||
if (rcrtc->cmm->dev)
|
||||
if (rcrtc->cmm)
|
||||
rcar_cmm_enable(rcrtc->cmm->dev);
|
||||
rcar_du_crtc_get(rcrtc);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user