From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Fri, 8 Mar 2024 08:47:22 +0000 (+0100)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d6eb77731c45caf6ee7b18d907e9bc44be760e8c;p=linux.git
Merge drm/drm-next into drm-misc-next
Backmerging to get the latest fixes from drm-next; specifically the
build fix from the patchset at [1]. Also fixes the build by removing
an unused variable from rzg2l_du_vsp_atomic_flush().
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/series/130720/ # 1
---
d6eb77731c45caf6ee7b18d907e9bc44be760e8c
diff --cc drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
index 0ae6331d6430f,0ae6331d6430f..8643ff2eec46e
--- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
@@@ -66,9 -66,9 +66,6 @@@ void rzg2l_du_vsp_disable(struct rzg2l_
void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
{
struct vsp1_du_atomic_pipe_config cfg = { { 0, } };
-- struct rzg2l_du_crtc_state *state;
--
-- state = to_rzg2l_crtc_state(crtc->crtc.state);
vsp1_du_atomic_flush(crtc->vsp->vsp, crtc->vsp_pipe, &cfg);
}