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

drm/rockchip: vop2: fix double config done at one frame time

Browse Source 
Maybe appear the following case:
-> set gamma
-> config done
-> atomic commit
   --> update win format
   --> update win address
   ---> here maybe meet vop hardware frame start, and triggle some config take affect.
   ---> as only some config take affect, this maybe lead to iommu pagefault.
   --> update win size
   --> update win other parameters
-> config done

so we add vop2_wait_for_fs_by_done_bit_status() to make sure the first config done take
effect and then to do next frame config.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I6ec67b374b3afd2bed4a57aa1e7b729964df1736
This commit is contained in:
Sandy Huang
2022-01-13 16:07:03 +08:00
parent c7a58b42fc
commit 5aa1d0e08f
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2949,9 +2949,9 @@ static void vop2_crtc_load_lut(struct drm_crtc *crtc)
if (WARN_ON(!drm_modeset_is_locked(&crtc->mutex))) if (WARN_ON(!drm_modeset_is_locked(&crtc->mutex)))
return; return;
if (vop2->version == VOP_VERSION_RK3568) if (vop2->version == VOP_VERSION_RK3568) {
return rk3568_crtc_load_lut(crtc); return rk3568_crtc_load_lut(crtc);
else if (vop2->version == VOP_VERSION_RK3588) { } else if (vop2->version == VOP_VERSION_RK3588) {
struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state); struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state);
const struct vop2_video_port_data *vp_data = &vop2->data->vp[vp->id]; const struct vop2_video_port_data *vp_data = &vop2->data->vp[vp->id];
struct vop2_video_port *splice_vp = &vop2->vps[vp_data->splice_vp_id]; struct vop2_video_port *splice_vp = &vop2->vps[vp_data->splice_vp_id];
@@ -2961,6 +2961,23 @@ static void vop2_crtc_load_lut(struct drm_crtc *crtc)
rk3588_crtc_load_lut(&splice_vp->rockchip_crtc.crtc, vp->lut); rk3588_crtc_load_lut(&splice_vp->rockchip_crtc.crtc, vp->lut);
vop2_cfg_done(crtc); vop2_cfg_done(crtc);
} }
/*
* maybe appear the following case:
* -> set gamma
* -> config done
* -> atomic commit
* --> update win format
* --> update win address
* ---> here maybe meet vop hardware frame start, and triggle some config take affect.
* ---> as only some config take affect, this maybe lead to iommu pagefault.
* --> update win size
* --> update win other parameters
* -> config done
*
* so we add vop2_wait_for_fs_by_done_bit_status() to make sure the first config done take
* effect and then to do next frame config.
*/
vop2_wait_for_fs_by_done_bit_status(vp);
} }
static void rockchip_vop2_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, static void rockchip_vop2_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red,