Commit 3defb4fe authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-next-for-v6.6' of... 

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: default avatarDave 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
parents d9aa1da9 6b83c85b

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+2 −3
Original line number Diff line number Diff line
@@ -39,13 +39,12 @@ static void exynos_drm_crtc_atomic_disable(struct drm_crtc *crtc, 
	if (exynos_crtc->ops->atomic_disable)

		exynos_crtc->ops->atomic_disable(exynos_crtc);



	if (crtc->state->event && !crtc->state->active) {

	spin_lock_irq(&crtc->dev->event_lock);

	if (crtc->state->event && !crtc->state->active) {

		drm_crtc_send_vblank_event(crtc, crtc->state->event);

		spin_unlock_irq(&crtc->dev->event_lock);



		crtc->state->event = NULL;

	}

	spin_unlock_irq(&crtc->dev->event_lock);

}



static int exynos_crtc_atomic_check(struct drm_crtc *crtc,

drivers/gpu/drm/exynos/exynos_drm_gsc.c

+1 −1
Original line number Diff line number Diff line
@@ -1426,6 +1426,6 @@ struct platform_driver gsc_driver = { 
		.name	= "exynos-drm-gsc",

		.owner	= THIS_MODULE,

		.pm	= &gsc_pm_ops,

		.of_match_table = of_match_ptr(exynos_drm_gsc_of_match),

		.of_match_table = exynos_drm_gsc_of_match,

	},

};