shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop2: set dsc config done in crtc post enable

Browse Source 
DSC has strict constraint with timing output from VOP. If
vp reset dclk after DSC ready, something will be wrong with
DSC. To avoid this issue, it need set dsc config done after
dclk reset.

Fixes: fdcec7349c ("drm/rockchip: vop2: reset dclk after config stream output")

Change-Id: Ied1cddc381eacd86771ae52af82f31f887fdbf89
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
This commit is contained in:
Zhang Yubing
2025-02-27 10:42:31 +08:00
committed by Tao Huang
parent e9fd48e4a9
commit e4a7f591fe
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@@ -1073,6 +1073,7 @@ static const struct drm_bus_format_enum_list drm_bus_format_enum_list[] = {
static DRM_ENUM_NAME_FN(drm_get_bus_format_name, drm_bus_format_enum_list)
static inline void rk3588_vop2_dsc_cfg_done(struct drm_crtc *crtc);
static inline void vop2_cfg_done(struct drm_crtc *crtc);
static void vop2_wait_for_fs_by_done_bit_status(struct vop2_video_port *vp);
static int vop2_clk_reset(struct reset_control *rstc);
@@ -1260,6 +1261,7 @@ static void vop2_crtc_output_post_enable(struct drm_crtc *crtc, int intf)
{
struct vop2_video_port *vp = to_vop2_video_port(crtc);
struct vop2 *vop2 = vp->vop2;
struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state);
if (intf & VOP_OUTPUT_IF_DP0)
VOP_CTRL_SET(vop2, dp0_en, 1);
@@ -1276,6 +1278,15 @@ static void vop2_crtc_output_post_enable(struct drm_crtc *crtc, int intf)
if (!vp->loader_protect)
vop2_clk_reset(vp->dclk_rst);
/*
* DSC has strict constraint with timing output from VOP.
* If vp reset dclk after DSC ready, something will be
* wrong with DSC. To avoid this issue, it need set dsc
* config done after dclk reset.
*/
if (vcstate->dsc_enable)
rk3588_vop2_dsc_cfg_done(crtc);
drm_info(vop2, "vop enable intf:%x\n", intf);
}
@@ -10415,8 +10426,6 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_sta
vop3_mcu_mode_setup(crtc);
}
if (vcstate->dsc_enable)
rk3588_vop2_dsc_cfg_done(crtc);
drm_crtc_vblank_on(crtc);
/*
* restore the lut table.