Skip to content

Commit afa965a

Browse files
saschahauermmind
authored andcommitted
drm/rockchip: vop2: fix suspend/resume
During a suspend/resume cycle the VO power domain will be disabled and the VOP2 registers will reset to their default values. After that the cached register values will be out of sync and the read/modify/write operations we do on the window registers will result in bogus values written. Fix this by re-initializing the register cache each time we enable the VOP2. With this the VOP2 will show a picture after a suspend/resume cycle whereas without this the screen stays dark. Fixes: 604be85 ("drm/rockchip: Add VOP2 driver") Cc: [email protected] Signed-off-by: Sascha Hauer <[email protected]> Tested-by: Chris Morgan <[email protected]> Signed-off-by: Heiko Stuebner <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 11b3b9f commit afa965a

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/gpu/drm/rockchip/rockchip_drm_vop2.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ struct vop2 {
215215
struct vop2_win win[];
216216
};
217217

218+
static const struct regmap_config vop2_regmap_config;
219+
218220
static struct vop2_video_port *to_vop2_video_port(struct drm_crtc *crtc)
219221
{
220222
return container_of(crtc, struct vop2_video_port, crtc);
@@ -839,6 +841,12 @@ static void vop2_enable(struct vop2 *vop2)
839841
return;
840842
}
841843

844+
ret = regmap_reinit_cache(vop2->map, &vop2_regmap_config);
845+
if (ret) {
846+
drm_err(vop2->drm, "failed to reinit cache: %d\n", ret);
847+
return;
848+
}
849+
842850
if (vop2->data->soc_id == 3566)
843851
vop2_writel(vop2, RK3568_OTP_WIN_EN, 1);
844852

0 commit comments

Comments
 (0)