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

Commit baa2f024 authored by Sean Paul's avatar Sean Paul Committed by Heiko Stuebner
Browse files

drm/rockchip: Remove analogix psr worker 



Now that the spinlocks and timers are gone, we can remove the psr
worker located in rockchip's analogix driver and do the enable/disable
directly. This should simplify the code and remove races on disable.

Cc: 征增 王 <wzz@rock-chips.com>
Cc: Stéphane Marchesin <marcheu@chromium.org>
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/20180309222327.18689-3-enric.balletbo@collabora.com
parent 1d38e421

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

+2 −29
Original line number Diff line number Diff line
@@ -71,10 +71,6 @@ struct rockchip_dp_device { 
	struct regmap            *grf;

	struct reset_control     *rst;



	struct work_struct	 psr_work;

	struct mutex             psr_lock;

	unsigned int             psr_state;



	const struct rockchip_dp_chip_data *data;



	struct analogix_dp_device *adp;
@@ -84,28 +80,13 @@ struct rockchip_dp_device { 
static void analogix_dp_psr_set(struct drm_encoder *encoder, bool enabled)

{

	struct rockchip_dp_device *dp = to_dp(encoder);

	int ret;



	if (!analogix_dp_psr_supported(dp->adp))

		return;



	DRM_DEV_DEBUG(dp->dev, "%s PSR...\n", enabled ? "Entry" : "Exit");



	mutex_lock(&dp->psr_lock);

	if (enabled)

		dp->psr_state = EDP_VSC_PSR_STATE_ACTIVE;

	else

		dp->psr_state = ~EDP_VSC_PSR_STATE_ACTIVE;



	schedule_work(&dp->psr_work);

	mutex_unlock(&dp->psr_lock);

}



static void analogix_dp_psr_work(struct work_struct *work)

{

	struct rockchip_dp_device *dp =

				container_of(work, typeof(*dp), psr_work);

	int ret;



	ret = rockchip_drm_wait_vact_end(dp->encoder.crtc,

					 PSR_WAIT_LINE_FLAG_TIMEOUT_MS);

	if (ret) {
@@ -113,12 +94,10 @@ static void analogix_dp_psr_work(struct work_struct *work) 
		return;

	}



	mutex_lock(&dp->psr_lock);

	if (dp->psr_state == EDP_VSC_PSR_STATE_ACTIVE)

	if (enabled)

		analogix_dp_enable_psr(dp->adp);

	else

		analogix_dp_disable_psr(dp->adp);

	mutex_unlock(&dp->psr_lock);

}



static int rockchip_dp_pre_init(struct rockchip_dp_device *dp)
@@ -135,8 +114,6 @@ static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data) 
	struct rockchip_dp_device *dp = to_dp(plat_data);

	int ret;



	cancel_work_sync(&dp->psr_work);



	ret = clk_prepare_enable(dp->pclk);

	if (ret < 0) {

		DRM_DEV_ERROR(dp->dev, "failed to enable pclk %d\n", ret);
@@ -355,10 +332,6 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, 
	dp->plat_data.power_off = rockchip_dp_powerdown;

	dp->plat_data.get_modes = rockchip_dp_get_modes;



	mutex_init(&dp->psr_lock);

	dp->psr_state = ~EDP_VSC_PSR_STATE_ACTIVE;

	INIT_WORK(&dp->psr_work, analogix_dp_psr_work);



	ret = rockchip_drm_psr_register(&dp->encoder, analogix_dp_psr_set);

	if (ret < 0)

		goto err_cleanup_encoder;