Commit 459b086d authored by Jeffy Chen's avatar Jeffy Chen Committed by Sean Paul
Browse files

drm/rockchip: Set line flag config register in vop_crtc_enable 



We need to set vop config done after update line flag config, it's a
new requirement for chips newer than rk3368.

Since we would only use line flag irq for vact_end, let's move it to
vop_crtc_enable.

Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Acked-by: default avatarMark Yao <mark.yao@rock-chips.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1493276057-4516-1-git-send-email-jeffy.chen@rock-chips.com
parent d753e41d

drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void analogix_dp_psr_work(struct work_struct *work) 


	vact_end = crtc->mode.vtotal - crtc->mode.vsync_start + crtc->mode.vdisplay;



	ret = rockchip_drm_wait_line_flag(dp->encoder.crtc, vact_end,

	ret = rockchip_drm_wait_vact_end(dp->encoder.crtc,

					 PSR_WAIT_LINE_FLAG_TIMEOUT_MS);

	if (ret) {

		dev_err(dp->dev, "line flag interrupt did not arrive\n");

drivers/gpu/drm/rockchip/rockchip_drm_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ int rockchip_drm_dma_attach_device(struct drm_device *drm_dev, 
				   struct device *dev);

void rockchip_drm_dma_detach_device(struct drm_device *drm_dev,

				    struct device *dev);

int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num,

				unsigned int mstimeout);

int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout);



extern struct platform_driver cdn_dp_driver;

extern struct platform_driver dw_hdmi_rockchip_pltfm_driver;

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+9 −11
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static bool vop_line_flag_irq_is_enabled(struct vop *vop) 
	return !!line_flag_irq;

}



static void vop_line_flag_irq_enable(struct vop *vop, int line_num)

static void vop_line_flag_irq_enable(struct vop *vop)

{

	unsigned long flags;
@@ -477,7 +477,6 @@ static void vop_line_flag_irq_enable(struct vop *vop, int line_num) 


	spin_lock_irqsave(&vop->irq_lock, flags);



	VOP_CTRL_SET(vop, line_flag_num[0], line_num);

	VOP_INTR_SET_TYPE(vop, clear, LINE_FLAG_INTR, 1);

	VOP_INTR_SET_TYPE(vop, enable, LINE_FLAG_INTR, 1);
@@ -981,6 +980,8 @@ static void vop_crtc_enable(struct drm_crtc *crtc) 
	VOP_CTRL_SET(vop, vact_st_end, val);

	VOP_CTRL_SET(vop, vpost_st_end, val);



	VOP_CTRL_SET(vop, line_flag_num[0], vact_end);



	clk_set_rate(vop->dclk, adjusted_mode->clock * 1000);



	VOP_CTRL_SET(vop, standby, 0);
@@ -1507,19 +1508,16 @@ static void vop_win_init(struct vop *vop) 
}



/**

 * rockchip_drm_wait_line_flag - acqiure the give line flag event

 * rockchip_drm_wait_vact_end

 * @crtc: CRTC to enable line flag

 * @line_num: interested line number

 * @mstimeout: millisecond for timeout

 *

 * Driver would hold here until the interested line flag interrupt have

 * happened or timeout to wait.

 * Wait for vact_end line flag irq or timeout.

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num,

				unsigned int mstimeout)

int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout)

{

	struct vop *vop = to_vop(crtc);

	unsigned long jiffies_left;
@@ -1527,14 +1525,14 @@ int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, 
	if (!crtc || !vop->is_enabled)

		return -ENODEV;



	if (line_num > crtc->mode.vtotal || mstimeout <= 0)

	if (mstimeout <= 0)

		return -EINVAL;



	if (vop_line_flag_irq_is_enabled(vop))

		return -EBUSY;



	reinit_completion(&vop->line_flag_completion);

	vop_line_flag_irq_enable(vop, line_num);

	vop_line_flag_irq_enable(vop);



	jiffies_left = wait_for_completion_timeout(&vop->line_flag_completion,

						   msecs_to_jiffies(mstimeout));
@@ -1547,7 +1545,7 @@ int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, 


	return 0;

}

EXPORT_SYMBOL(rockchip_drm_wait_line_flag);

EXPORT_SYMBOL(rockchip_drm_wait_vact_end);



static int vop_bind(struct device *dev, struct device *master, void *data)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE