From mboxrd@z Thu Jan 1 00:00:00 1970 From: maarten.lankhorst@linux.intel.com (Maarten Lankhorst) Date: Wed, 28 Jun 2017 15:28:12 +0200 Subject: [PATCH 2/2] drm/atomic: Wait indefinitely and interruptibly for hw_done. In-Reply-To: <20170628132812.14927-1-maarten.lankhorst@linux.intel.com> References: <20170628132812.14927-1-maarten.lankhorst@linux.intel.com> Message-ID: <20170628132812.14927-2-maarten.lankhorst@linux.intel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Without waiting for hw_done, previous atomic updates may dereference the wrong state and cause a lot of confusion. The real fix is fixing all obj->state to use the accessor macros, but for now wait indefinitely and interruptibly. Cc: Boris Brezillon Cc: David Airlie Cc: Daniel Vetter Cc: Jani Nikula Cc: Sean Paul Cc: CK Hu Cc: Philipp Zabel Cc: Matthias Brugger Cc: Rob Clark Cc: Ben Skeggs Cc: Thierry Reding Cc: Jonathan Hunter Cc: Jyri Sarha Cc: Tomi Valkeinen Cc: Eric Anholt Cc: dri-devel at lists.freedesktop.org Cc: linux-kernel at vger.kernel.org Cc: intel-gfx at lists.freedesktop.org Cc: linux-arm-kernel at lists.infradead.org Cc: linux-mediatek at lists.infradead.org Cc: linux-arm-msm at vger.kernel.org Cc: freedreno at lists.freedesktop.org Cc: nouveau at lists.freedesktop.org Cc: linux-tegra at vger.kernel.org Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/drm_atomic_helper.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index f66b6c45cdd0..56e7729d993d 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2144,8 +2144,7 @@ EXPORT_SYMBOL(drm_atomic_helper_cleanup_planes); int drm_atomic_helper_swap_state(struct drm_atomic_state *state, bool stall) { - int i; - long ret; + int i, ret; struct drm_connector *connector; struct drm_connector_state *old_conn_state, *new_conn_state; struct drm_crtc *crtc; @@ -2168,12 +2167,11 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state, if (!commit) continue; - ret = wait_for_completion_timeout(&commit->hw_done, - 10*HZ); - if (ret == 0) - DRM_ERROR("[CRTC:%d:%s] hw_done timed out\n", - crtc->base.id, crtc->name); + ret = wait_for_completion_interruptible(&commit->hw_done); drm_crtc_commit_put(commit); + + if (ret) + return ret; } } -- 2.11.0