]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/rockchip: vop2: disable planes when disabling the crtc
authorMichael Tretter <m.tretter@pengutronix.de>
Fri, 28 Oct 2022 09:52:06 +0000 (11:52 +0200)
committerHeiko Stuebner <heiko@sntech.de>
Sat, 29 Oct 2022 12:41:29 +0000 (14:41 +0200)
The vop2 driver needs to explicitly disable the planes if the crtc is
disabled. Unless the planes are explicitly disabled, the address of the
last framebuffer is kept in the registers of the VOP2. When re-enabling
the encoder after it has been disabled by the driver, the VOP2 will
start and read the framebuffer that has been freed but is still pointed
to by the register. The iommu will catch these read accesses and print
errors.

Explicitly disable the planes when the crtc is disabled to reset the
registers.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20221028095206.2136601-3-m.tretter@pengutronix.de
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c

index 26f8a8489ded41d0129febf339d688232e28b202..105a548d0abeb3972487fd0ea527ef35efbe691f 100644 (file)
@@ -877,10 +877,14 @@ static void vop2_crtc_atomic_disable(struct drm_crtc *crtc,
 {
        struct vop2_video_port *vp = to_vop2_video_port(crtc);
        struct vop2 *vop2 = vp->vop2;
+       struct drm_crtc_state *old_crtc_state;
        int ret;
 
        vop2_lock(vop2);
 
+       old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc);
+       drm_atomic_helper_disable_planes_on_crtc(old_crtc_state, false);
+
        drm_crtc_vblank_off(crtc);
 
        /*