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

drm/rockchip: vop2: wait for next frame when close to frame start of previous vp

Browse Source 
Only config done the current vp at the first 3/4 frame time
if there is another vp waiting for config done.

Change-Id: I0ee33182cf11cd6d502e0bf02684c8b09f3df26b
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
This commit is contained in:
Andy Yan
2021-01-12 19:02:16 +08:00
committed by Tao Huang
parent 2fc439df49
commit 4719c4e177
3 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/rockchip/rockchip_drm_drv.h
View File

@@ -120,6 +120,7 @@ struct rockchip_crtc_state {
int right_margin;
int top_margin;
int bottom_margin;
int vdisplay;
int afbdc_win_format;
int afbdc_win_width;
int afbdc_win_height;

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

@@ -712,11 +712,49 @@ static void vop2_load_sdr2hdr_table(struct vop2_video_port *vp, int sdr2hdr_tf)
table->sdr2hdr_st2084oetf_xn[i]);
}
static inline void vop2_cfg_done(struct drm_crtc *crtc)
static bool vop2_fs_irq_is_pending(struct vop2_video_port *vp)
{
struct vop2 *vop2 = vp->vop2;
const struct vop2_data *vop2_data = vop2->data;
const struct vop2_video_port_data *vp_data = &vop2_data->vp[vp->id];
const struct vop_intr *intr = vp_data->intr;
return VOP_INTR_GET_TYPE(vop2, intr, status, FS_FIELD_INTR);
}
static void vop2_wait_for_irq_handler(struct drm_crtc *crtc)
{
struct vop2_video_port *vp = to_vop2_video_port(crtc);
struct vop2 *vop2 = vp->vop2;
uint32_t done;
bool pending;
int ret;
/*
* Spin until frame start interrupt status bit goes low, which means
* that interrupt handler was invoked and cleared it. The timeout of
* 10 msecs is really too long, but it is just a safety measure if
* something goes really wrong. The wait will only happen in the very
* unlikely case of a vblank happening exactly at the same time and
* shouldn't exceed microseconds range.
*/
ret = readx_poll_timeout_atomic(vop2_fs_irq_is_pending, vp, pending,
!pending, 0, 10 * 1000);
if (ret)
DRM_DEV_ERROR(vop2->dev, "VOP vblank IRQ stuck for 10 ms\n");
synchronize_irq(vop2->irq);
}
static inline void vop2_cfg_done(struct drm_crtc *crtc)
{
struct vop2_video_port *vp = to_vop2_video_port(crtc);
struct vop2_video_port *done_vp;
struct rockchip_crtc_state *vcstate;
struct vop2 *vop2 = vp->vop2;
uint32_t done_bits;
uint32_t vp_id;
uint32_t vcnt;
uint32_t val;
/*
@@ -735,8 +773,20 @@ static inline void vop2_cfg_done(struct drm_crtc *crtc)
* So we do a read | write here.
*
*/
done = vop2_readl(vop2, 0) & 0x7;
val = RK3568_VOP2_GLB_CFG_DONE_EN | BIT(vp->id) | done;
done_bits = vop2_readl(vop2, RK3568_REG_CFG_DONE) & 0x7;
/* we have some vp wait for config done take effect */
if (done_bits) {
vp_id = ffs(done_bits) - 1;
done_vp = &vop2->vps[vp_id];
vcstate = to_rockchip_crtc_state(done_vp->crtc.state);
vcnt = vop2_readl(vop2, RK3568_SYS_STATUS0 + (vp_id << 2));
/* if close to the last 1/4 frame, wait to next frame */
if (vcnt > (vcstate->vdisplay * 3 >> 2)) {
vop2_wait_for_irq_handler(crtc);
done_bits = 0;
}
}
val = RK3568_VOP2_GLB_CFG_DONE_EN | BIT(vp->id) | done_bits;
vop2_writel(vop2, 0, val);
}
@@ -3403,6 +3453,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state
adjusted_mode->vrefresh, vcstate->output_type, vp->id);
vop2_initial(crtc);
VOP_MODULE_SET(vop2, vp, standby, 0);
vcstate->vdisplay = vdisplay;
vcstate->mode_update = vop2_crtc_mode_update(crtc);
if (vcstate->mode_update)
vop2_disable_all_planes_for_crtc(crtc);
@@ -4227,39 +4278,6 @@ static void vop2_cfg_update(struct drm_crtc *crtc,
spin_unlock(&vop2->reg_lock);
}
static bool vop2_fs_irq_is_pending(struct vop2_video_port *vp)
{
struct vop2 *vop2 = vp->vop2;
const struct vop2_data *vop2_data = vop2->data;
const struct vop2_video_port_data *vp_data = &vop2_data->vp[vp->id];
const struct vop_intr *intr = vp_data->intr;
return VOP_INTR_GET_TYPE(vop2, intr, status, FS_FIELD_INTR);
}
static void vop2_wait_for_irq_handler(struct drm_crtc *crtc)
{
struct vop2_video_port *vp = to_vop2_video_port(crtc);
struct vop2 *vop2 = vp->vop2;
bool pending;
int ret;
/*
* Spin until frame start interrupt status bit goes low, which means
* that interrupt handler was invoked and cleared it. The timeout of
* 10 msecs is really too long, but it is just a safety measure if
* something goes really wrong. The wait will only happen in the very
* unlikely case of a vblank happening exactly at the same time and
* shouldn't exceed microseconds range.
*/
ret = readx_poll_timeout_atomic(vop2_fs_irq_is_pending, vp, pending,
!pending, 0, 10 * 1000);
if (ret)
DRM_DEV_ERROR(vop2->dev, "VOP vblank IRQ stuck for 10 ms\n");
synchronize_irq(vop2->irq);
}
static void vop2_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_crtc_state *old_cstate)
{
struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state);

1
drivers/gpu/drm/rockchip/rockchip_vop_reg.h
View File

@@ -1062,6 +1062,7 @@
#define RK3568_WB_YRGB_MST 0x48
#define RK3568_WB_CBR_MST 0x4C
#define RK3568_LUT_PORT_SEL 0x058
#define RK3568_SYS_STATUS0 0x060
#define RK3568_VP0_LINE_FLAG 0x70
#define RK3568_VP1_LINE_FLAG 0x74
#define RK3568_VP2_LINE_FLAG 0x78