Skip to content

Commit 3defb4f

Browse files
committed
Merge tag 'exynos-drm-next-for-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
Fixup - fix a possible null pointer dereference issue in exynos_drm_crtc_atomic_disable(), which was reported by the automatic static analysis tool. And below is a relevant link, https://sites.google.com/view/basscheck/home Cleanup - drop the use of of_match_ptr which is redundant. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Inki Dae <inki.dae@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230809060216.374042-1-inki.dae@samsung.com
2 parents d9aa1da + 6b83c85 commit 3defb4f

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

drivers/gpu/drm/exynos/exynos_drm_crtc.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,12 @@ static void exynos_drm_crtc_atomic_disable(struct drm_crtc *crtc,
3939
if (exynos_crtc->ops->atomic_disable)
4040
exynos_crtc->ops->atomic_disable(exynos_crtc);
4141

42+
spin_lock_irq(&crtc->dev->event_lock);
4243
if (crtc->state->event && !crtc->state->active) {
43-
spin_lock_irq(&crtc->dev->event_lock);
4444
drm_crtc_send_vblank_event(crtc, crtc->state->event);
45-
spin_unlock_irq(&crtc->dev->event_lock);
46-
4745
crtc->state->event = NULL;
4846
}
47+
spin_unlock_irq(&crtc->dev->event_lock);
4948
}
5049

5150
static int exynos_crtc_atomic_check(struct drm_crtc *crtc,

drivers/gpu/drm/exynos/exynos_drm_gsc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1426,6 +1426,6 @@ struct platform_driver gsc_driver = {
14261426
.name = "exynos-drm-gsc",
14271427
.owner = THIS_MODULE,
14281428
.pm = &gsc_pm_ops,
1429-
.of_match_table = of_match_ptr(exynos_drm_gsc_of_match),
1429+
.of_match_table = exynos_drm_gsc_of_match,
14301430
},
14311431
};

0 commit comments

Comments
 (0)