* [PATCH] drm/rockchip: analogix_dp: Remove unused check and variables
@ 2017-04-29 12:39 Jeffy Chen
2017-05-02 18:50 ` Sean Paul
0 siblings, 1 reply; 2+ messages in thread
From: Jeffy Chen @ 2017-04-29 12:39 UTC (permalink / raw)
To: linux-kernel
Cc: tfiga, dbasehore, seanpaul, dianders, mark.yao, Jeffy Chen,
Heiko Stuebner, dri-devel, linux-rockchip, David Airlie,
linux-arm-kernel
Remove unused check and variables after:
drm/rockchip: Set line flag config register in vop_crtc_enable
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 9bfdbc6..1bccd82 100644
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -104,17 +104,9 @@ static void analogix_dp_psr_work(struct work_struct *work)
{
struct rockchip_dp_device *dp =
container_of(work, typeof(*dp), psr_work);
- struct drm_crtc *crtc = dp->encoder.crtc;
- int psr_state = dp->psr_state;
- int vact_end;
int ret;
unsigned long flags;
- if (!crtc)
- return;
-
- vact_end = crtc->mode.vtotal - crtc->mode.vsync_start + crtc->mode.vdisplay;
-
ret = rockchip_drm_wait_vact_end(dp->encoder.crtc,
PSR_WAIT_LINE_FLAG_TIMEOUT_MS);
if (ret) {
@@ -123,7 +115,7 @@ static void analogix_dp_psr_work(struct work_struct *work)
}
spin_lock_irqsave(&dp->psr_lock, flags);
- if (psr_state == EDP_VSC_PSR_STATE_ACTIVE)
+ if (dp->psr_state == EDP_VSC_PSR_STATE_ACTIVE)
analogix_dp_enable_psr(dp->dev);
else
analogix_dp_disable_psr(dp->dev);
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/rockchip: analogix_dp: Remove unused check and variables
2017-04-29 12:39 [PATCH] drm/rockchip: analogix_dp: Remove unused check and variables Jeffy Chen
@ 2017-05-02 18:50 ` Sean Paul
0 siblings, 0 replies; 2+ messages in thread
From: Sean Paul @ 2017-05-02 18:50 UTC (permalink / raw)
To: Jeffy Chen
Cc: linux-kernel, tfiga, dbasehore, seanpaul, dianders, mark.yao,
Heiko Stuebner, dri-devel, linux-rockchip, David Airlie,
linux-arm-kernel
On Sat, Apr 29, 2017 at 08:39:07PM +0800, Jeffy Chen wrote:
> Remove unused check and variables after:
> drm/rockchip: Set line flag config register in vop_crtc_enable
>
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
>
> ---
Applied to -misc-next, thanks.
Sean
>
> drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> index 9bfdbc6..1bccd82 100644
> --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
> @@ -104,17 +104,9 @@ static void analogix_dp_psr_work(struct work_struct *work)
> {
> struct rockchip_dp_device *dp =
> container_of(work, typeof(*dp), psr_work);
> - struct drm_crtc *crtc = dp->encoder.crtc;
> - int psr_state = dp->psr_state;
> - int vact_end;
> int ret;
> unsigned long flags;
>
> - if (!crtc)
> - return;
> -
> - vact_end = crtc->mode.vtotal - crtc->mode.vsync_start + crtc->mode.vdisplay;
> -
> ret = rockchip_drm_wait_vact_end(dp->encoder.crtc,
> PSR_WAIT_LINE_FLAG_TIMEOUT_MS);
> if (ret) {
> @@ -123,7 +115,7 @@ static void analogix_dp_psr_work(struct work_struct *work)
> }
>
> spin_lock_irqsave(&dp->psr_lock, flags);
> - if (psr_state == EDP_VSC_PSR_STATE_ACTIVE)
> + if (dp->psr_state == EDP_VSC_PSR_STATE_ACTIVE)
> analogix_dp_enable_psr(dp->dev);
> else
> analogix_dp_disable_psr(dp->dev);
> --
> 2.1.4
>
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-02 18:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-29 12:39 [PATCH] drm/rockchip: analogix_dp: Remove unused check and variables Jeffy Chen
2017-05-02 18:50 ` Sean Paul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).