From: Sean Paul <seanpaul@chromium.org> To: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org Cc: zain wang <wzz@rock-chips.com>, Heiko Stuebner <heiko@sntech.de>, David Airlie <airlied@linux.ie>, Sean Paul <seanpaul@chromium.org>, linux-arm-kernel@lists.infradead.org, Mark Yao <mark.yao@rock-chips.com> Subject: [PATCH 11/41] drm/rockchip: add mutex vop lock Date: Thu, 9 Mar 2017 23:32:26 -0500 [thread overview] Message-ID: <20170310043305.17216-12-seanpaul@chromium.org> (raw) In-Reply-To: <20170310043305.17216-1-seanpaul@chromium.org> From: zain wang <wzz@rock-chips.com> Add a lock to vop to avoid disabling the crtc while waiting for a line flag while enabling psr. If we disable in the middle of waiting for the line flag, we'll end up timing out or worse. Signed-off-by: zain wang <wzz@rock-chips.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 30 +++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 1c1e8535ad28..aa5c528c59fc 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -130,6 +130,7 @@ struct vop { spinlock_t reg_lock; /* lock vop irq reg */ spinlock_t irq_lock; + struct mutex vop_lock; unsigned int irq; @@ -568,6 +569,7 @@ static void vop_crtc_disable(struct drm_crtc *crtc) WARN_ON(vop->event); + mutex_lock(&vop->vop_lock); /* * We need to make sure that all windows are disabled before we * disable that crtc. Otherwise we might try to scan from a destroyed @@ -619,6 +621,7 @@ static void vop_crtc_disable(struct drm_crtc *crtc) clk_disable(vop->aclk); clk_disable(vop->hclk); pm_runtime_put(vop->dev); + mutex_unlock(&vop->vop_lock); if (crtc->state->event && !crtc->state->active) { spin_lock_irq(&crtc->dev->event_lock); @@ -885,10 +888,13 @@ static void vop_crtc_enable(struct drm_crtc *crtc) uint32_t pin_pol, val; int ret; + mutex_lock(&vop->vop_lock); + WARN_ON(vop->event); ret = vop_enable(crtc); if (ret) { + mutex_unlock(&vop->vop_lock); DRM_DEV_ERROR(vop->dev, "Failed to enable vop (%d)\n", ret); return; } @@ -979,6 +985,7 @@ static void vop_crtc_enable(struct drm_crtc *crtc) clk_set_rate(vop->dclk, adjusted_mode->clock * 1000); VOP_CTRL_SET(vop, standby, 0); + mutex_unlock(&vop->vop_lock); } static bool vop_fs_irq_is_pending(struct vop *vop) @@ -1506,15 +1513,22 @@ int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, { struct vop *vop = to_vop(crtc); unsigned long jiffies_left; + int ret = 0; if (!crtc || !vop->is_enabled) return -ENODEV; - if (line_num > crtc->mode.vtotal || mstimeout <= 0) - return -EINVAL; + mutex_lock(&vop->vop_lock); + + if (line_num > crtc->mode.vtotal || mstimeout <= 0) { + ret = -EINVAL; + goto out; + } - if (vop_line_flag_irq_is_enabled(vop)) - return -EBUSY; + if (vop_line_flag_irq_is_enabled(vop)) { + ret = -EBUSY; + goto out; + } reinit_completion(&vop->line_flag_completion); vop_line_flag_irq_enable(vop, line_num); @@ -1525,10 +1539,13 @@ int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, if (jiffies_left == 0) { dev_err(vop->dev, "Timeout waiting for IRQ\n"); - return -ETIMEDOUT; + ret = -ETIMEDOUT; + goto out; } - return 0; +out: + mutex_unlock(&vop->vop_lock); + return ret; } EXPORT_SYMBOL(rockchip_drm_wait_line_flag); @@ -1584,6 +1601,7 @@ static int vop_bind(struct device *dev, struct device *master, void *data) spin_lock_init(&vop->reg_lock); spin_lock_init(&vop->irq_lock); + mutex_init(&vop->vop_lock); ret = devm_request_irq(dev, vop->irq, vop_isr, IRQF_SHARED, dev_name(dev), vop); -- 2.12.0.246.ga2ecc84866-goog
WARNING: multiple messages have this Message-ID (diff)
From: seanpaul@chromium.org (Sean Paul) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/41] drm/rockchip: add mutex vop lock Date: Thu, 9 Mar 2017 23:32:26 -0500 [thread overview] Message-ID: <20170310043305.17216-12-seanpaul@chromium.org> (raw) In-Reply-To: <20170310043305.17216-1-seanpaul@chromium.org> From: zain wang <wzz@rock-chips.com> Add a lock to vop to avoid disabling the crtc while waiting for a line flag while enabling psr. If we disable in the middle of waiting for the line flag, we'll end up timing out or worse. Signed-off-by: zain wang <wzz@rock-chips.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 30 +++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 1c1e8535ad28..aa5c528c59fc 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -130,6 +130,7 @@ struct vop { spinlock_t reg_lock; /* lock vop irq reg */ spinlock_t irq_lock; + struct mutex vop_lock; unsigned int irq; @@ -568,6 +569,7 @@ static void vop_crtc_disable(struct drm_crtc *crtc) WARN_ON(vop->event); + mutex_lock(&vop->vop_lock); /* * We need to make sure that all windows are disabled before we * disable that crtc. Otherwise we might try to scan from a destroyed @@ -619,6 +621,7 @@ static void vop_crtc_disable(struct drm_crtc *crtc) clk_disable(vop->aclk); clk_disable(vop->hclk); pm_runtime_put(vop->dev); + mutex_unlock(&vop->vop_lock); if (crtc->state->event && !crtc->state->active) { spin_lock_irq(&crtc->dev->event_lock); @@ -885,10 +888,13 @@ static void vop_crtc_enable(struct drm_crtc *crtc) uint32_t pin_pol, val; int ret; + mutex_lock(&vop->vop_lock); + WARN_ON(vop->event); ret = vop_enable(crtc); if (ret) { + mutex_unlock(&vop->vop_lock); DRM_DEV_ERROR(vop->dev, "Failed to enable vop (%d)\n", ret); return; } @@ -979,6 +985,7 @@ static void vop_crtc_enable(struct drm_crtc *crtc) clk_set_rate(vop->dclk, adjusted_mode->clock * 1000); VOP_CTRL_SET(vop, standby, 0); + mutex_unlock(&vop->vop_lock); } static bool vop_fs_irq_is_pending(struct vop *vop) @@ -1506,15 +1513,22 @@ int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, { struct vop *vop = to_vop(crtc); unsigned long jiffies_left; + int ret = 0; if (!crtc || !vop->is_enabled) return -ENODEV; - if (line_num > crtc->mode.vtotal || mstimeout <= 0) - return -EINVAL; + mutex_lock(&vop->vop_lock); + + if (line_num > crtc->mode.vtotal || mstimeout <= 0) { + ret = -EINVAL; + goto out; + } - if (vop_line_flag_irq_is_enabled(vop)) - return -EBUSY; + if (vop_line_flag_irq_is_enabled(vop)) { + ret = -EBUSY; + goto out; + } reinit_completion(&vop->line_flag_completion); vop_line_flag_irq_enable(vop, line_num); @@ -1525,10 +1539,13 @@ int rockchip_drm_wait_line_flag(struct drm_crtc *crtc, unsigned int line_num, if (jiffies_left == 0) { dev_err(vop->dev, "Timeout waiting for IRQ\n"); - return -ETIMEDOUT; + ret = -ETIMEDOUT; + goto out; } - return 0; +out: + mutex_unlock(&vop->vop_lock); + return ret; } EXPORT_SYMBOL(rockchip_drm_wait_line_flag); @@ -1584,6 +1601,7 @@ static int vop_bind(struct device *dev, struct device *master, void *data) spin_lock_init(&vop->reg_lock); spin_lock_init(&vop->irq_lock); + mutex_init(&vop->vop_lock); ret = devm_request_irq(dev, vop->irq, vop_isr, IRQF_SHARED, dev_name(dev), vop); -- 2.12.0.246.ga2ecc84866-goog
next prev parent reply other threads:[~2017-03-10 4:32 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-10 4:32 [PATCH 00/41] Chromebook Plus (aka kevin) kernel patches Sean Paul 2017-03-10 4:32 ` [PATCH 01/41] drm/panel: simple: Change mode for Sharp lq123p1jx31 Sean Paul 2017-03-20 13:59 ` Thierry Reding 2017-03-20 16:37 ` Doug Anderson 2017-03-20 20:01 ` Stéphane Marchesin 2017-03-20 20:05 ` Doug Anderson 2017-03-10 4:32 ` [PATCH 03/41] drm/rockchip: support prime import sg table Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-12-12 12:32 ` Heiko Stuebner 2017-12-12 12:32 ` Heiko Stuebner 2017-03-10 4:32 ` [PATCH 04/41] drm/rockchip: Respect page offset for PRIME mmap calls Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-12-12 16:58 ` Heiko Stuebner 2017-12-12 16:58 ` Heiko Stuebner 2017-03-10 4:32 ` [PATCH 05/41] drm/bridge: analogix_dp: set psr activate/deactivate when enable/disable bridge Sean Paul 2017-03-10 4:32 ` Sean Paul [not found] ` <20170310043305.17216-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> 2017-03-10 4:32 ` [PATCH 02/41] drm/rockchip: Get rid of some unnecessary code Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-12-12 12:25 ` Heiko Stuebner 2017-12-12 12:25 ` Heiko Stuebner 2017-03-10 4:32 ` [PATCH 06/41] drm/bridge: analogix_dp: Don't power bridge in analogix_dp_bind Sean Paul 2017-03-16 12:31 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 08/41] drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR Sean Paul 2017-03-16 13:28 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 12/41] drm/bridge: analogix_dp: add fast link train for eDP Sean Paul 2017-03-16 14:14 ` Andrzej Hajda 2017-03-21 20:37 ` Sean Paul 2017-03-22 8:07 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 15/41] drm/bridge: analogix_dp: Move enable video into config_video() Sean Paul 2017-03-16 14:26 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 16/41] drm/bridge: analogix_dp: Check AUX_EN status when doing AUX transfer Sean Paul 2017-03-16 14:28 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 17/41] drm/bridge: analogix_dp: Don't use fast link training when panel just powered up Sean Paul 2017-03-16 14:34 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 18/41] drm/bridge: analogix_dp: Retry bridge enable when it failed Sean Paul 2017-03-16 14:45 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 19/41] drm/bridge: analogix_dp: Wait for HPD signal before configuring link Sean Paul 2017-03-16 14:51 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 21/41] drm/bridge: analogix_dp: Ensure edp is disabled when shutting down the panel Sean Paul 2017-03-22 8:29 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 22/41] drm/bridge: analogix_dp: Extend hpd check time to 100ms Sean Paul 2017-03-22 8:32 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 23/41] drm/bridge: analogix_dp: Fix incorrect usage of enhanced mode Sean Paul 2017-03-22 8:46 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 24/41] drm/bridge: analogix_dp: Check dpcd write/read status Sean Paul 2017-03-22 9:00 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 25/41] drm/bridge: analogix_dp: Fix AUX_PD bit for Rockchip Sean Paul 2017-03-22 9:09 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 26/41] drm/bridge: analogix_dp: Reset aux channel if an error occurred Sean Paul 2017-03-22 9:14 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 35/41] drm/rockchip: analogix_dp: Fix invalid implementation of unbind Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-03-10 4:32 ` [PATCH 36/41] drm/bridge: analogix_dp: Add analogix_dp_shutdown Sean Paul 2017-03-10 4:32 ` [PATCH 37/41] drm/rockchip: analogix_dp: Wire the shutdown callback to disable PSR Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-03-10 4:32 ` [PATCH 38/41] drm/bridge: analogix_dp: Reorder plat_data->power_off to happen sooner Sean Paul 2017-03-22 10:34 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 41/41] drm/bridge: analogix_dp: Properly disable aux chan retries on rockchip Sean Paul 2017-03-22 10:57 ` Andrzej Hajda 2017-03-22 15:59 ` Doug Anderson 2017-03-28 15:40 ` Javier Martinez Canillas 2017-03-10 4:32 ` [PATCH 07/41] drm/rockchip: Don't use atomic constructs for psr Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-03-10 4:32 ` [PATCH 09/41] drm/rockchip: Remove analogix psr worker Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-03-10 4:32 ` [PATCH 10/41] drm/bridge: analogix_dp: Don't change psr while bridge is disabled Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-03-16 13:40 ` Andrzej Hajda 2017-03-16 13:40 ` Andrzej Hajda 2017-03-21 19:58 ` Sean Paul 2017-03-21 19:58 ` Sean Paul 2017-03-22 8:36 ` Andrzej Hajda 2017-03-22 8:36 ` Andrzej Hajda 2017-03-22 15:19 ` Sean Paul 2017-03-22 15:19 ` Sean Paul 2017-03-23 9:04 ` Andrzej Hajda 2017-03-23 9:04 ` Andrzej Hajda 2017-03-10 4:32 ` Sean Paul [this message] 2017-03-10 4:32 ` [PATCH 11/41] drm/rockchip: add mutex vop lock Sean Paul 2017-03-10 4:32 ` [PATCH 13/41] drm/rockchip: pre dither down when output bpc is 8bit Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-03-10 4:32 ` [PATCH 14/41] drm/rockchip: Only wait for panel ACK on PSR entry Sean Paul 2017-03-10 4:32 ` [PATCH 20/41] drm/bridge: analogix_dp: Set PD_INC_BG first when powering up edp phy Sean Paul 2017-03-16 14:54 ` Andrzej Hajda 2017-03-16 14:54 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 27/41] drm/rockchip: Restore psr->state when enable/disable psr failed Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-03-10 4:32 ` [PATCH 28/41] drm/bridge: analogix_dp: Don't use ANALOGIX_DP_PLL_CTL to control pll Sean Paul 2017-03-22 9:17 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 29/41] drm/bridge: analogix_dp: Fix timeout of video streamclk config Sean Paul 2017-03-22 9:24 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 30/41] drm/bridge: analogix_dp: Fix incorrect operations with register ANALOGIX_DP_FUNC_EN_1 Sean Paul 2017-03-22 9:29 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 31/41] drm/bridge: analogix_dp: Move fast link training detect to set_bridge Sean Paul 2017-03-22 10:25 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 32/41] drm/rockchip: Flush PSR before committing modeset disables/enables Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-03-10 4:32 ` [PATCH 33/41] drm/rockchip: Disable VOP windows when PSR is active Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-03-10 4:32 ` [PATCH 34/41] drm/bridge: analogix_dp: Allow master driver to cleanup in unbind Sean Paul 2017-03-10 7:09 ` Tomasz Figa 2017-03-10 14:24 ` Sean Paul 2017-03-10 4:32 ` [PATCH 39/41] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts Sean Paul 2017-03-10 4:32 ` Sean Paul 2017-03-22 10:42 ` Andrzej Hajda 2017-03-22 10:42 ` Andrzej Hajda 2017-03-10 4:32 ` [PATCH 40/41] drm/bridge: analogix_dp: Properly log AUX CH errors Sean Paul 2017-03-22 10:47 ` Andrzej Hajda 2017-03-14 20:43 ` [PATCH 00/41] Chromebook Plus (aka kevin) kernel patches Sean Paul 2017-03-16 16:45 ` Enric Balletbo Serra
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=20170310043305.17216-12-seanpaul@chromium.org \ --to=seanpaul@chromium.org \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=heiko@sntech.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mark.yao@rock-chips.com \ --cc=wzz@rock-chips.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.