Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f3c191b authored by zain wang's avatar zain wang Committed by Heiko Stuebner
Browse files

drm/rockchip: analogix_dp: set psr activate/deactivate when enable/disable bridge 



There's a race between when bridge_disable and when vop_crtc_disable
are called. If the flush timer triggers a new psr work between these,
we will operate eDP without power shutdowned by bridge_disable. In this
case, moving activate/deactivate to enable/disable bridge to avoid it.

Cc: Stéphane Marchesin <marcheu@chromium.org>
Signed-off-by: default avatarzain wang <wzz@rock-chips.com>
Signed-off-by: default avatarCaesar Wang <wxt@rock-chips.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180305222324.5872-2-enric.balletbo@collabora.com
parent 8ba905f1

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

+6 −1
Original line number Diff line number Diff line
@@ -150,12 +150,17 @@ static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data) 
		return ret;

	}



	return 0;

	return rockchip_drm_psr_activate(&dp->encoder);

}



static int rockchip_dp_powerdown(struct analogix_dp_plat_data *plat_data)

{

	struct rockchip_dp_device *dp = to_dp(plat_data);

	int ret;



	ret = rockchip_drm_psr_deactivate(&dp->encoder);

	if (ret != 0)

		return ret;



	clk_disable_unprepare(dp->pclk);

drivers/gpu/drm/rockchip/rockchip_drm_psr.c

+24 −6
Original line number Diff line number Diff line
@@ -57,6 +57,24 @@ static struct psr_drv *find_psr_by_crtc(struct drm_crtc *crtc) 
	return psr;

}



static struct psr_drv *find_psr_by_encoder(struct drm_encoder *encoder)

{

	struct rockchip_drm_private *drm_drv = encoder->dev->dev_private;

	struct psr_drv *psr;

	unsigned long flags;



	spin_lock_irqsave(&drm_drv->psr_list_lock, flags);

	list_for_each_entry(psr, &drm_drv->psr_list, list) {

		if (psr->encoder == encoder)

			goto out;

	}

	psr = ERR_PTR(-ENODEV);



out:

	spin_unlock_irqrestore(&drm_drv->psr_list_lock, flags);

	return psr;

}



static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state)

{

	/*
@@ -115,14 +133,14 @@ static void psr_flush_handler(struct timer_list *t) 


/**

 * rockchip_drm_psr_activate - activate PSR on the given pipe

 * @crtc: CRTC to obtain the PSR encoder

 * @encoder: encoder to obtain the PSR encoder

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

int rockchip_drm_psr_activate(struct drm_crtc *crtc)

int rockchip_drm_psr_activate(struct drm_encoder *encoder)

{

	struct psr_drv *psr = find_psr_by_crtc(crtc);

	struct psr_drv *psr = find_psr_by_encoder(encoder);

	unsigned long flags;



	if (IS_ERR(psr))
@@ -138,14 +156,14 @@ EXPORT_SYMBOL(rockchip_drm_psr_activate); 


/**

 * rockchip_drm_psr_deactivate - deactivate PSR on the given pipe

 * @crtc: CRTC to obtain the PSR encoder

 * @encoder: encoder to obtain the PSR encoder

 *

 * Returns:

 * Zero on success, negative errno on failure.

 */

int rockchip_drm_psr_deactivate(struct drm_crtc *crtc)

int rockchip_drm_psr_deactivate(struct drm_encoder *encoder)

{

	struct psr_drv *psr = find_psr_by_crtc(crtc);

	struct psr_drv *psr = find_psr_by_encoder(encoder);

	unsigned long flags;



	if (IS_ERR(psr))

drivers/gpu/drm/rockchip/rockchip_drm_psr.h

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
void rockchip_drm_psr_flush_all(struct drm_device *dev);

int rockchip_drm_psr_flush(struct drm_crtc *crtc);



int rockchip_drm_psr_activate(struct drm_crtc *crtc);

int rockchip_drm_psr_deactivate(struct drm_crtc *crtc);

int rockchip_drm_psr_activate(struct drm_encoder *encoder);

int rockchip_drm_psr_deactivate(struct drm_encoder *encoder);



int rockchip_drm_psr_register(struct drm_encoder *encoder,

			void (*psr_set)(struct drm_encoder *, bool enable));

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+0 −4
Original line number Diff line number Diff line
@@ -569,8 +569,6 @@ static void vop_crtc_atomic_disable(struct drm_crtc *crtc, 


	WARN_ON(vop->event);



	rockchip_drm_psr_deactivate(&vop->crtc);



	drm_crtc_vblank_off(crtc);



	/*
@@ -937,8 +935,6 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc, 
	clk_set_rate(vop->dclk, adjusted_mode->clock * 1000);



	VOP_REG_SET(vop, common, standby, 0);



	rockchip_drm_psr_activate(&vop->crtc);

}



static bool vop_fs_irq_is_pending(struct vop *vop)