All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrzej Hajda <a.hajda@samsung.com>
To: Enric Balletbo i Serra <enric.balletbo@collabora.com>,
	architt@codeaurora.org, inki.dae@samsung.com,
	thierry.reding@gmail.com, hjc@rock-chips.com,
	seanpaul@chromium.org, airlied@linux.ie, tfiga@chromium.org,
	heiko@sntech.de
Cc: dri-devel@lists.freedesktop.org, dianders@chromium.org,
	ykk@rock-chips.com, kernel@collabora.com,
	m.szyprowski@samsung.com, linux-samsung-soc@vger.kernel.org,
	jy0922.shim@samsung.com, rydberg@bitmath.org, krzk@kernel.org,
	linux-rockchip@lists.infradead.org, kgene@kernel.org,
	linux-input@vger.kernel.org, orjan.eide@arm.com,
	wxt@rock-chips.com, jeffy.chen@rock-chips.com,
	linux-arm-kernel@lists.infradead.org, mark.yao@rock-chips.com,
	wzz@rock-chips.com, hl@rock-chips.com, jingoohan1@gmail.com,
	sw0312.kim@samsung.com, linux-kernel@vger.kernel.org,
	kyungmin.park@samsung.com, Laurent.pinchart@ideasonboard.com,
	kuankuan.y@gmail.com, hshi@chromium.org
Subject: Re: [PATCH v6 26/30] drm/rockchip: psr: Avoid redundant calls to .set() callback
Date: Mon, 16 Apr 2018 11:06:49 +0200	[thread overview]
Message-ID: <c6a89199-a5e0-abad-3e53-3ef12da076b9@samsung.com> (raw)
In-Reply-To: <20180405095000.9756-27-enric.balletbo@collabora.com>

On 05.04.2018 11:49, Enric Balletbo i Serra wrote:
> From: Tomasz Figa <tfiga@chromium.org>
>
> The first time after we call rockchip_drm_do_flush() after
> rockchip_drm_psr_register(), we go from PSR_DISABLE to PSR_FLUSH. The
> difference between PSR_DISABLE and PSR_FLUSH is whether or not we have a
> delayed work pending - PSR is off in either state.  However
> psr_set_state() only catches the transition from PSR_FLUSH to
> PSR_DISABLE (which never happens), while going from PSR_DISABLE to
> PSR_FLUSH triggers a call to psr->set() to disable PSR while it's
> already disabled. This triggers the eDP PHY power-on sequence without
> being shut down first and this seems to occasionally leave the encoder
> unable to later enable PSR. Let's just simplify the state machine and
> simply consider PSR_DISABLE and PSR_FLUSH the same state. This lets us
> represent the hardware state by a simple boolean called "enabled" and,
> while at it, rename the misleading "active" boolean to "inhibit", which
> represents the purpose much better.

This phrase has no corresponding part in the patch.

>
> Also, userspace can (and does) trigger the rockchip_drm_do_flush() path
> from drmModeDirtyFB() at any time, whether or the encoder is active. If
> no mode is set, we call into analogix_dp_psr_set() which returns -EINVAL
> because encoder->crtc is NULL. Avoid this by starting out with
> psr->allowed set to false.

ditto

>
> Signed-off-by: Kristian H. Kristensen <hoegsberg@chromium.org>
> Signed-off-by: Tomasz Figa <tfiga@chromium.org>

Original author should be first, 1st line of the patch "From:...."
suggests it should be Tomasz.

Regards
Andrzej

> Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>
>  drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 79 +++++++++--------------------
>  1 file changed, 23 insertions(+), 56 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
> index c8655e625ba2..448c5fde241c 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
> @@ -22,19 +22,13 @@
>  
>  #define PSR_FLUSH_TIMEOUT_MS	100
>  
> -enum psr_state {
> -	PSR_FLUSH,
> -	PSR_ENABLE,
> -	PSR_DISABLE,
> -};
> -
>  struct psr_drv {
>  	struct list_head	list;
>  	struct drm_encoder	*encoder;
>  
>  	struct mutex		lock;
>  	bool			active;
> -	enum psr_state		state;
> +	bool			enabled;
>  
>  	struct delayed_work	flush_work;
>  	struct work_struct	disable_work;
> @@ -78,52 +72,22 @@ static struct psr_drv *find_psr_by_encoder(struct drm_encoder *encoder)
>  	return psr;
>  }
>  
> -static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state)
> +static int psr_set_state_locked(struct psr_drv *psr, bool enable)
>  {
> -	/*
> -	 * Allowed finite state machine:
> -	 *
> -	 *   PSR_ENABLE  < = = = = = >  PSR_FLUSH
> -	 *       | ^                        |
> -	 *       | |                        |
> -	 *       v |                        |
> -	 *   PSR_DISABLE < - - - - - - - - -
> -	 */
> -	if (state == psr->state || !psr->active)
> -		return;
> -
> -	/* Already disabled in flush, change the state, but not the hardware */
> -	if (state == PSR_DISABLE && psr->state == PSR_FLUSH) {
> -		psr->state = state;
> -		return;
> -	}
> +	int ret;
>  
> -	/* Actually commit the state change to hardware */
> -	switch (state) {
> -	case PSR_ENABLE:
> -		if (psr->set(psr->encoder, true))
> -			return;
> -		break;
> -
> -	case PSR_DISABLE:
> -	case PSR_FLUSH:
> -		if (psr->set(psr->encoder, false))
> -			return;
> -		break;
> -
> -	default:
> -		pr_err("%s: Unknown state %d\n", __func__, state);
> -		return;
> -	}
> +	if (!psr->active)
> +		return -EINVAL;
>  
> -	psr->state = state;
> -}
> +	if (enable == psr->enabled)
> +		return 0;
>  
> -static void psr_set_state(struct psr_drv *psr, enum psr_state state)
> -{
> -	mutex_lock(&psr->lock);
> -	psr_set_state_locked(psr, state);
> -	mutex_unlock(&psr->lock);
> +	ret = psr->set(psr->encoder, enable);
> +	if (ret)
> +		return ret;
> +
> +	psr->enabled = enable;
> +	return 0;
>  }
>  
>  static void psr_flush_handler(struct work_struct *work)
> @@ -131,10 +95,8 @@ static void psr_flush_handler(struct work_struct *work)
>  	struct psr_drv *psr = container_of(to_delayed_work(work),
>  					   struct psr_drv, flush_work);
>  
> -	/* If the state has changed since we initiated the flush, do nothing */
>  	mutex_lock(&psr->lock);
> -	if (psr->state == PSR_FLUSH)
> -		psr_set_state_locked(psr, PSR_ENABLE);
> +	psr_set_state_locked(psr, true);
>  	mutex_unlock(&psr->lock);
>  }
>  
> @@ -176,6 +138,7 @@ int rockchip_drm_psr_deactivate(struct drm_encoder *encoder)
>  
>  	mutex_lock(&psr->lock);
>  	psr->active = false;
> +	psr->enabled = false;
>  	mutex_unlock(&psr->lock);
>  	cancel_delayed_work_sync(&psr->flush_work);
>  	cancel_work_sync(&psr->disable_work);
> @@ -187,8 +150,12 @@ EXPORT_SYMBOL(rockchip_drm_psr_deactivate);
>  static void rockchip_drm_do_flush(struct psr_drv *psr)
>  {
>  	cancel_delayed_work_sync(&psr->flush_work);
> -	psr_set_state(psr, PSR_FLUSH);
> -	mod_delayed_work(system_wq, &psr->flush_work, PSR_FLUSH_TIMEOUT_MS);
> +
> +	mutex_lock(&psr->lock);
> +	if (!psr_set_state_locked(psr, false))
> +		mod_delayed_work(system_wq, &psr->flush_work,
> +				 PSR_FLUSH_TIMEOUT_MS);
> +	mutex_unlock(&psr->lock);
>  }
>  
>  /**
> @@ -355,8 +322,8 @@ int rockchip_drm_psr_register(struct drm_encoder *encoder,
>  	INIT_WORK(&psr->disable_work, psr_disable_handler);
>  	mutex_init(&psr->lock);
>  
> -	psr->active = true;
> -	psr->state = PSR_DISABLE;
> +	psr->active = false;
> +	psr->enabled = false;
>  	psr->encoder = encoder;
>  	psr->set = psr_set;
>  

WARNING: multiple messages have this Message-ID
From: Andrzej Hajda <a.hajda@samsung.com>
To: Enric Balletbo i Serra <enric.balletbo@collabora.com>,
	architt@codeaurora.org, inki.dae@samsung.com,
	thierry.reding@gmail.com, hjc@rock-chips.com,
	seanpaul@chromium.org, airlied@linux.ie, tfiga@chromium.org,
	heiko@sntech.de
Cc: dri-devel@lists.freedesktop.org, dianders@chromium.org,
	Laurent.pinchart@ideasonboard.com, ykk@rock-chips.com,
	kernel@collabora.com, m.szyprowski@samsung.com,
	linux-samsung-soc@vger.kernel.org, rydberg@bitmath.org,
	krzk@kernel.org, linux-rockchip@lists.infradead.org,
	kgene@kernel.org, linux-input@vger.kernel.org,
	orjan.eide@arm.com, wxt@rock-chips.com,
	jeffy.chen@rock-chips.com, linux-arm-kernel@lists.infradead.org,
	mark.yao@rock-chips.com, wzz@rock-chips.com, hl@rock-chips.com,
	jingoohan1@gmail.com, sw0312.kim@samsung.com,
	linux-kernel@vger.kernel.org, kyungmin.park@samsung.com,
	kuankuan.y@gmail.com, hshi@chromium.org
Subject: Re: [PATCH v6 26/30] drm/rockchip: psr: Avoid redundant calls to .set() callback
Date: Mon, 16 Apr 2018 11:06:49 +0200	[thread overview]
Message-ID: <c6a89199-a5e0-abad-3e53-3ef12da076b9@samsung.com> (raw)
In-Reply-To: <20180405095000.9756-27-enric.balletbo@collabora.com>

On 05.04.2018 11:49, Enric Balletbo i Serra wrote:
> From: Tomasz Figa <tfiga@chromium.org>
>
> The first time after we call rockchip_drm_do_flush() after
> rockchip_drm_psr_register(), we go from PSR_DISABLE to PSR_FLUSH. The
> difference between PSR_DISABLE and PSR_FLUSH is whether or not we have a
> delayed work pending - PSR is off in either state.  However
> psr_set_state() only catches the transition from PSR_FLUSH to
> PSR_DISABLE (which never happens), while going from PSR_DISABLE to
> PSR_FLUSH triggers a call to psr->set() to disable PSR while it's
> already disabled. This triggers the eDP PHY power-on sequence without
> being shut down first and this seems to occasionally leave the encoder
> unable to later enable PSR. Let's just simplify the state machine and
> simply consider PSR_DISABLE and PSR_FLUSH the same state. This lets us
> represent the hardware state by a simple boolean called "enabled" and,
> while at it, rename the misleading "active" boolean to "inhibit", which
> represents the purpose much better.

This phrase has no corresponding part in the patch.

>
> Also, userspace can (and does) trigger the rockchip_drm_do_flush() path
> from drmModeDirtyFB() at any time, whether or the encoder is active. If
> no mode is set, we call into analogix_dp_psr_set() which returns -EINVAL
> because encoder->crtc is NULL. Avoid this by starting out with
> psr->allowed set to false.

ditto

>
> Signed-off-by: Kristian H. Kristensen <hoegsberg@chromium.org>
> Signed-off-by: Tomasz Figa <tfiga@chromium.org>

Original author should be first, 1st line of the patch "From:...."
suggests it should be Tomasz.

Regards
Andrzej

> Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>
>  drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 79 +++++++++--------------------
>  1 file changed, 23 insertions(+), 56 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
> index c8655e625ba2..448c5fde241c 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
> @@ -22,19 +22,13 @@
>  
>  #define PSR_FLUSH_TIMEOUT_MS	100
>  
> -enum psr_state {
> -	PSR_FLUSH,
> -	PSR_ENABLE,
> -	PSR_DISABLE,
> -};
> -
>  struct psr_drv {
>  	struct list_head	list;
>  	struct drm_encoder	*encoder;
>  
>  	struct mutex		lock;
>  	bool			active;
> -	enum psr_state		state;
> +	bool			enabled;
>  
>  	struct delayed_work	flush_work;
>  	struct work_struct	disable_work;
> @@ -78,52 +72,22 @@ static struct psr_drv *find_psr_by_encoder(struct drm_encoder *encoder)
>  	return psr;
>  }
>  
> -static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state)
> +static int psr_set_state_locked(struct psr_drv *psr, bool enable)
>  {
> -	/*
> -	 * Allowed finite state machine:
> -	 *
> -	 *   PSR_ENABLE  < = = = = = >  PSR_FLUSH
> -	 *       | ^                        |
> -	 *       | |                        |
> -	 *       v |                        |
> -	 *   PSR_DISABLE < - - - - - - - - -
> -	 */
> -	if (state == psr->state || !psr->active)
> -		return;
> -
> -	/* Already disabled in flush, change the state, but not the hardware */
> -	if (state == PSR_DISABLE && psr->state == PSR_FLUSH) {
> -		psr->state = state;
> -		return;
> -	}
> +	int ret;
>  
> -	/* Actually commit the state change to hardware */
> -	switch (state) {
> -	case PSR_ENABLE:
> -		if (psr->set(psr->encoder, true))
> -			return;
> -		break;
> -
> -	case PSR_DISABLE:
> -	case PSR_FLUSH:
> -		if (psr->set(psr->encoder, false))
> -			return;
> -		break;
> -
> -	default:
> -		pr_err("%s: Unknown state %d\n", __func__, state);
> -		return;
> -	}
> +	if (!psr->active)
> +		return -EINVAL;
>  
> -	psr->state = state;
> -}
> +	if (enable == psr->enabled)
> +		return 0;
>  
> -static void psr_set_state(struct psr_drv *psr, enum psr_state state)
> -{
> -	mutex_lock(&psr->lock);
> -	psr_set_state_locked(psr, state);
> -	mutex_unlock(&psr->lock);
> +	ret = psr->set(psr->encoder, enable);
> +	if (ret)
> +		return ret;
> +
> +	psr->enabled = enable;
> +	return 0;
>  }
>  
>  static void psr_flush_handler(struct work_struct *work)
> @@ -131,10 +95,8 @@ static void psr_flush_handler(struct work_struct *work)
>  	struct psr_drv *psr = container_of(to_delayed_work(work),
>  					   struct psr_drv, flush_work);
>  
> -	/* If the state has changed since we initiated the flush, do nothing */
>  	mutex_lock(&psr->lock);
> -	if (psr->state == PSR_FLUSH)
> -		psr_set_state_locked(psr, PSR_ENABLE);
> +	psr_set_state_locked(psr, true);
>  	mutex_unlock(&psr->lock);
>  }
>  
> @@ -176,6 +138,7 @@ int rockchip_drm_psr_deactivate(struct drm_encoder *encoder)
>  
>  	mutex_lock(&psr->lock);
>  	psr->active = false;
> +	psr->enabled = false;
>  	mutex_unlock(&psr->lock);
>  	cancel_delayed_work_sync(&psr->flush_work);
>  	cancel_work_sync(&psr->disable_work);
> @@ -187,8 +150,12 @@ EXPORT_SYMBOL(rockchip_drm_psr_deactivate);
>  static void rockchip_drm_do_flush(struct psr_drv *psr)
>  {
>  	cancel_delayed_work_sync(&psr->flush_work);
> -	psr_set_state(psr, PSR_FLUSH);
> -	mod_delayed_work(system_wq, &psr->flush_work, PSR_FLUSH_TIMEOUT_MS);
> +
> +	mutex_lock(&psr->lock);
> +	if (!psr_set_state_locked(psr, false))
> +		mod_delayed_work(system_wq, &psr->flush_work,
> +				 PSR_FLUSH_TIMEOUT_MS);
> +	mutex_unlock(&psr->lock);
>  }
>  
>  /**
> @@ -355,8 +322,8 @@ int rockchip_drm_psr_register(struct drm_encoder *encoder,
>  	INIT_WORK(&psr->disable_work, psr_disable_handler);
>  	mutex_init(&psr->lock);
>  
> -	psr->active = true;
> -	psr->state = PSR_DISABLE;
> +	psr->active = false;
> +	psr->enabled = false;
>  	psr->encoder = encoder;
>  	psr->set = psr_set;
>  


_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID
From: a.hajda@samsung.com (Andrzej Hajda)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 26/30] drm/rockchip: psr: Avoid redundant calls to .set() callback
Date: Mon, 16 Apr 2018 11:06:49 +0200	[thread overview]
Message-ID: <c6a89199-a5e0-abad-3e53-3ef12da076b9@samsung.com> (raw)
In-Reply-To: <20180405095000.9756-27-enric.balletbo@collabora.com>

On 05.04.2018 11:49, Enric Balletbo i Serra wrote:
> From: Tomasz Figa <tfiga@chromium.org>
>
> The first time after we call rockchip_drm_do_flush() after
> rockchip_drm_psr_register(), we go from PSR_DISABLE to PSR_FLUSH. The
> difference between PSR_DISABLE and PSR_FLUSH is whether or not we have a
> delayed work pending - PSR is off in either state.  However
> psr_set_state() only catches the transition from PSR_FLUSH to
> PSR_DISABLE (which never happens), while going from PSR_DISABLE to
> PSR_FLUSH triggers a call to psr->set() to disable PSR while it's
> already disabled. This triggers the eDP PHY power-on sequence without
> being shut down first and this seems to occasionally leave the encoder
> unable to later enable PSR. Let's just simplify the state machine and
> simply consider PSR_DISABLE and PSR_FLUSH the same state. This lets us
> represent the hardware state by a simple boolean called "enabled" and,
> while at it, rename the misleading "active" boolean to "inhibit", which
> represents the purpose much better.

This phrase has no corresponding part in the patch.

>
> Also, userspace can (and does) trigger the rockchip_drm_do_flush() path
> from drmModeDirtyFB() at any time, whether or the encoder is active. If
> no mode is set, we call into analogix_dp_psr_set() which returns -EINVAL
> because encoder->crtc is NULL. Avoid this by starting out with
> psr->allowed set to false.

ditto

>
> Signed-off-by: Kristian H. Kristensen <hoegsberg@chromium.org>
> Signed-off-by: Tomasz Figa <tfiga@chromium.org>

Original author should be first, 1st line of the patch "From:...."
suggests it should be Tomasz.

Regards
Andrzej

> Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>
>  drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 79 +++++++++--------------------
>  1 file changed, 23 insertions(+), 56 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
> index c8655e625ba2..448c5fde241c 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
> @@ -22,19 +22,13 @@
>  
>  #define PSR_FLUSH_TIMEOUT_MS	100
>  
> -enum psr_state {
> -	PSR_FLUSH,
> -	PSR_ENABLE,
> -	PSR_DISABLE,
> -};
> -
>  struct psr_drv {
>  	struct list_head	list;
>  	struct drm_encoder	*encoder;
>  
>  	struct mutex		lock;
>  	bool			active;
> -	enum psr_state		state;
> +	bool			enabled;
>  
>  	struct delayed_work	flush_work;
>  	struct work_struct	disable_work;
> @@ -78,52 +72,22 @@ static struct psr_drv *find_psr_by_encoder(struct drm_encoder *encoder)
>  	return psr;
>  }
>  
> -static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state)
> +static int psr_set_state_locked(struct psr_drv *psr, bool enable)
>  {
> -	/*
> -	 * Allowed finite state machine:
> -	 *
> -	 *   PSR_ENABLE  < = = = = = >  PSR_FLUSH
> -	 *       | ^                        |
> -	 *       | |                        |
> -	 *       v |                        |
> -	 *   PSR_DISABLE < - - - - - - - - -
> -	 */
> -	if (state == psr->state || !psr->active)
> -		return;
> -
> -	/* Already disabled in flush, change the state, but not the hardware */
> -	if (state == PSR_DISABLE && psr->state == PSR_FLUSH) {
> -		psr->state = state;
> -		return;
> -	}
> +	int ret;
>  
> -	/* Actually commit the state change to hardware */
> -	switch (state) {
> -	case PSR_ENABLE:
> -		if (psr->set(psr->encoder, true))
> -			return;
> -		break;
> -
> -	case PSR_DISABLE:
> -	case PSR_FLUSH:
> -		if (psr->set(psr->encoder, false))
> -			return;
> -		break;
> -
> -	default:
> -		pr_err("%s: Unknown state %d\n", __func__, state);
> -		return;
> -	}
> +	if (!psr->active)
> +		return -EINVAL;
>  
> -	psr->state = state;
> -}
> +	if (enable == psr->enabled)
> +		return 0;
>  
> -static void psr_set_state(struct psr_drv *psr, enum psr_state state)
> -{
> -	mutex_lock(&psr->lock);
> -	psr_set_state_locked(psr, state);
> -	mutex_unlock(&psr->lock);
> +	ret = psr->set(psr->encoder, enable);
> +	if (ret)
> +		return ret;
> +
> +	psr->enabled = enable;
> +	return 0;
>  }
>  
>  static void psr_flush_handler(struct work_struct *work)
> @@ -131,10 +95,8 @@ static void psr_flush_handler(struct work_struct *work)
>  	struct psr_drv *psr = container_of(to_delayed_work(work),
>  					   struct psr_drv, flush_work);
>  
> -	/* If the state has changed since we initiated the flush, do nothing */
>  	mutex_lock(&psr->lock);
> -	if (psr->state == PSR_FLUSH)
> -		psr_set_state_locked(psr, PSR_ENABLE);
> +	psr_set_state_locked(psr, true);
>  	mutex_unlock(&psr->lock);
>  }
>  
> @@ -176,6 +138,7 @@ int rockchip_drm_psr_deactivate(struct drm_encoder *encoder)
>  
>  	mutex_lock(&psr->lock);
>  	psr->active = false;
> +	psr->enabled = false;
>  	mutex_unlock(&psr->lock);
>  	cancel_delayed_work_sync(&psr->flush_work);
>  	cancel_work_sync(&psr->disable_work);
> @@ -187,8 +150,12 @@ EXPORT_SYMBOL(rockchip_drm_psr_deactivate);
>  static void rockchip_drm_do_flush(struct psr_drv *psr)
>  {
>  	cancel_delayed_work_sync(&psr->flush_work);
> -	psr_set_state(psr, PSR_FLUSH);
> -	mod_delayed_work(system_wq, &psr->flush_work, PSR_FLUSH_TIMEOUT_MS);
> +
> +	mutex_lock(&psr->lock);
> +	if (!psr_set_state_locked(psr, false))
> +		mod_delayed_work(system_wq, &psr->flush_work,
> +				 PSR_FLUSH_TIMEOUT_MS);
> +	mutex_unlock(&psr->lock);
>  }
>  
>  /**
> @@ -355,8 +322,8 @@ int rockchip_drm_psr_register(struct drm_encoder *encoder,
>  	INIT_WORK(&psr->disable_work, psr_disable_handler);
>  	mutex_init(&psr->lock);
>  
> -	psr->active = true;
> -	psr->state = PSR_DISABLE;
> +	psr->active = false;
> +	psr->enabled = false;
>  	psr->encoder = encoder;
>  	psr->set = psr_set;
>  

  reply	other threads:[~2018-04-16  9:06 UTC|newest]

Thread overview: 123+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-05  9:49 [PATCH v6 00/30] DRM Rockchip rk3399 (Kevin) Enric Balletbo i Serra
2018-04-05  9:49 ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 01/30] drm/bridge: analogix_dp: Move enable video into config_video() Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-09  3:37   ` Sasha Levin
2018-04-05  9:49 ` [PATCH v6 02/30] drm/bridge: analogix_dp: Check AUX_EN status when doing AUX transfer Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 03/30] drm/bridge: analogix_dp: Don't use fast link training when panel just powered up Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 04/30] drm/bridge: analogix_dp: Retry bridge enable when it failed Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 05/30] drm/bridge: analogix_dp: Wait for HPD signal before configuring link Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-09  3:37   ` Sasha Levin
2018-04-09  3:37     ` Sasha Levin
2018-04-05  9:49 ` [PATCH v6 06/30] drm/bridge: analogix_dp: Set PD_INC_BG first when powering up edp phy Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-09  3:36   ` Sasha Levin
2018-04-09  3:36     ` Sasha Levin
2018-04-05  9:49 ` [PATCH v6 07/30] drm/bridge: analogix_dp: Ensure edp is disabled when shutting down the panel Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-09  3:36   ` Sasha Levin
2018-04-09  3:36     ` Sasha Levin
2018-04-05  9:49 ` [PATCH v6 08/30] drm/bridge: analogix_dp: Extend hpd check time to 100ms Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 09/30] drm/bridge: analogix_dp: Fix incorrect usage of enhanced mode Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 10/30] drm/bridge: analogix_dp: Check dpcd write/read status Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 11/30] drm/bridge: analogix_dp: Fix AUX_PD bit for Rockchip Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 12/30] drm/bridge: analogix_dp: Reset aux channel if an error occurred Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 13/30] drm/rockchip: Restore psr->state when enable/disable psr failed Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 14/30] drm/bridge: analogix_dp: Don't use ANALOGIX_DP_PLL_CTL to control pll Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 15/30] drm/bridge: analogix_dp: Fix timeout of video streamclk config Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-09  3:36   ` Sasha Levin
2018-04-09  3:36     ` Sasha Levin
2018-04-05  9:49 ` [PATCH v6 16/30] drm/bridge: analogix_dp: Fix incorrect operations with register ANALOGIX_DP_FUNC_EN_1 Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-09  3:36   ` Sasha Levin
2018-04-09  3:36     ` Sasha Levin
2018-04-05  9:49 ` [PATCH v6 17/30] drm/bridge: analogix_dp: Move fast link training detect to set_bridge Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 18/30] drm/bridge: analogix_dp: Reorder plat_data->power_off to happen sooner Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-09  3:36   ` Sasha Levin
2018-04-05  9:49 ` [PATCH v6 19/30] drm/bridge: analogix_dp: Properly log AUX CH errors Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 20/30] drm/bridge: analogix_dp: Properly disable aux chan retries on rockchip Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 21/30] drm/rockchip: pre dither down when output bpc is 8bit Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-09  3:36   ` Sasha Levin
2018-04-09  3:36     ` Sasha Levin
2018-04-05  9:49 ` [PATCH v6 22/30] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 23/30] drm/rockchip: analogix_dp: Do not call Analogix code before bind Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-09  3:36   ` Sasha Levin
2018-04-09  3:36     ` Sasha Levin
2018-04-12  9:54   ` Andrzej Hajda
2018-04-12  9:54     ` Andrzej Hajda
2018-04-12  9:54     ` Andrzej Hajda
2018-04-05  9:49 ` [PATCH v6 24/30] drm/rockchip: Disable PSR on input events Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-16  7:19   ` Andrzej Hajda
2018-04-16  7:19     ` Andrzej Hajda
2018-04-16  7:19     ` Andrzej Hajda
2018-04-16 17:41     ` Dmitry Torokhov
2018-04-16 17:41       ` Dmitry Torokhov
2018-04-16 17:41       ` Dmitry Torokhov
2018-04-16 19:42   ` Ezequiel Garcia
2018-04-16 19:42     ` Ezequiel Garcia
2018-04-20 13:47   ` Andrzej Hajda
2018-04-20 13:47     ` Andrzej Hajda
2018-04-20 13:51     ` Enric Balletbo i Serra
2018-04-20 13:51       ` Enric Balletbo i Serra
2018-04-05  9:49 ` [PATCH v6 25/30] drm/rockchip: Cancel PSR enable work before changing the state Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-16  8:55   ` Andrzej Hajda
2018-04-16  8:55     ` Andrzej Hajda
2018-04-16  8:55     ` Andrzej Hajda
2018-04-05  9:49 ` [PATCH v6 26/30] drm/rockchip: psr: Avoid redundant calls to .set() callback Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-16  9:06   ` Andrzej Hajda [this message]
2018-04-16  9:06     ` Andrzej Hajda
2018-04-16  9:06     ` Andrzej Hajda
2018-04-05  9:49 ` [PATCH v6 27/30] drm/rockchip: psr: Sanitize semantics of allow/disallow API Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-16  9:26   ` Andrzej Hajda
2018-04-16  9:26     ` Andrzej Hajda
2018-04-16  9:26     ` Andrzej Hajda
2018-04-05  9:49 ` [PATCH v6 28/30] drm/rockchip: Disable PSR from reboot notifier Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-16  9:57   ` Andrzej Hajda
2018-04-16  9:57     ` Andrzej Hajda
2018-04-16  9:57     ` Andrzej Hajda
2018-04-16 13:12     ` Tomasz Figa
2018-04-16 13:12       ` Tomasz Figa
2018-04-16 13:12       ` Tomasz Figa
2018-04-18  9:18       ` Enric Balletbo Serra
2018-04-18  9:18         ` Enric Balletbo Serra
2018-04-18  9:18         ` Enric Balletbo Serra
2018-04-05  9:49 ` [PATCH v6 29/30] drm/rockchip: Disallow PSR for the whole atomic commit Enric Balletbo i Serra
2018-04-05  9:49   ` Enric Balletbo i Serra
2018-04-16  9:51   ` Andrzej Hajda
2018-04-16  9:51     ` Andrzej Hajda
2018-04-16  9:51     ` Andrzej Hajda
2018-04-05  9:50 ` [PATCH v6 30/30] drm/rockchip: psr: Remove flush by CRTC Enric Balletbo i Serra
2018-04-05  9:50   ` Enric Balletbo i Serra
2018-04-16  9:53   ` Andrzej Hajda
2018-04-16  9:53     ` Andrzej Hajda
2018-04-16  9:53     ` Andrzej Hajda

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c6a89199-a5e0-abad-3e53-3ef12da076b9@samsung.com \
    --to=a.hajda@samsung.com \
    --cc=Laurent.pinchart@ideasonboard.com \
    --cc=airlied@linux.ie \
    --cc=architt@codeaurora.org \
    --cc=dianders@chromium.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=enric.balletbo@collabora.com \
    --cc=heiko@sntech.de \
    --cc=hjc@rock-chips.com \
    --cc=hl@rock-chips.com \
    --cc=hshi@chromium.org \
    --cc=inki.dae@samsung.com \
    --cc=jeffy.chen@rock-chips.com \
    --cc=jingoohan1@gmail.com \
    --cc=jy0922.shim@samsung.com \
    --cc=kernel@collabora.com \
    --cc=kgene@kernel.org \
    --cc=krzk@kernel.org \
    --cc=kuankuan.y@gmail.com \
    --cc=kyungmin.park@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=mark.yao@rock-chips.com \
    --cc=orjan.eide@arm.com \
    --cc=rydberg@bitmath.org \
    --cc=seanpaul@chromium.org \
    --cc=sw0312.kim@samsung.com \
    --cc=tfiga@chromium.org \
    --cc=thierry.reding@gmail.com \
    --cc=wxt@rock-chips.com \
    --cc=wzz@rock-chips.com \
    --cc=ykk@rock-chips.com \
    --subject='Re: [PATCH v6 26/30] drm/rockchip: psr: Avoid redundant calls to .set() callback' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.