From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, linux-mediatek@lists.infradead.org, Philipp Zabel <p.zabel@pengutronix.de>, CK Hu <ck.hu@mediatek.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 06/12] drm/mediatek: Handle drm_atomic_helper_swap_state failure Date: Tue, 11 Jul 2017 16:33:08 +0200 [thread overview] Message-ID: <20170711143314.2148-7-maarten.lankhorst@linux.intel.com> (raw) In-Reply-To: <20170711143314.2148-1-maarten.lankhorst@linux.intel.com> drm_atomic_helper_swap_state() will be changed to interruptible waiting in the next few commits, so all drivers have to be changed to handling failure. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: CK Hu <ck.hu@mediatek.com> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 56f802d0a51c..9a130c84c861 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -109,7 +109,12 @@ static int mtk_atomic_commit(struct drm_device *drm, mutex_lock(&private->commit.lock); flush_work(&private->commit.work); - drm_atomic_helper_swap_state(state, true); + ret = drm_atomic_helper_swap_state(state, true); + if (ret) { + mutex_unlock(&private->commit.lock); + drm_atomic_helper_cleanup_planes(drm, state); + return ret; + } drm_atomic_state_get(state); if (async) -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: maarten.lankhorst@linux.intel.com (Maarten Lankhorst) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 06/12] drm/mediatek: Handle drm_atomic_helper_swap_state failure Date: Tue, 11 Jul 2017 16:33:08 +0200 [thread overview] Message-ID: <20170711143314.2148-7-maarten.lankhorst@linux.intel.com> (raw) In-Reply-To: <20170711143314.2148-1-maarten.lankhorst@linux.intel.com> drm_atomic_helper_swap_state() will be changed to interruptible waiting in the next few commits, so all drivers have to be changed to handling failure. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: CK Hu <ck.hu@mediatek.com> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: linux-arm-kernel at lists.infradead.org Cc: linux-mediatek at lists.infradead.org --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 56f802d0a51c..9a130c84c861 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -109,7 +109,12 @@ static int mtk_atomic_commit(struct drm_device *drm, mutex_lock(&private->commit.lock); flush_work(&private->commit.work); - drm_atomic_helper_swap_state(state, true); + ret = drm_atomic_helper_swap_state(state, true); + if (ret) { + mutex_unlock(&private->commit.lock); + drm_atomic_helper_cleanup_planes(drm, state); + return ret; + } drm_atomic_state_get(state); if (async) -- 2.11.0
next prev parent reply other threads:[~2017-07-11 14:33 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-07-11 14:33 [PATCH v2 00/12] drm/atomic: Make drm_atomic_helper_swap_state waiting interruptible Maarten Lankhorst 2017-07-11 14:33 ` [PATCH v2 01/12] drm/nouveau: Fix error handling in nv50_disp_atomic_commit Maarten Lankhorst 2017-07-14 14:28 ` [Intel-gfx] " Daniel Vetter 2017-07-11 14:33 ` [PATCH v2 02/12] drm/atomic: Change drm_atomic_helper_swap_state to return an error Maarten Lankhorst 2017-07-11 14:33 ` Maarten Lankhorst 2017-07-14 14:30 ` [Intel-gfx] " Daniel Vetter 2017-07-14 14:55 ` Sean Paul 2017-07-11 14:33 ` [PATCH v2 04/12] drm/atmel-hlcdc: Handle drm_atomic_helper_swap_state failure Maarten Lankhorst 2017-07-11 14:33 ` [PATCH v2 05/12] drm/i915: " Maarten Lankhorst 2017-07-11 14:33 ` Maarten Lankhorst [this message] 2017-07-11 14:33 ` [PATCH v2 06/12] drm/mediatek: " Maarten Lankhorst 2017-07-12 10:00 ` Philipp Zabel 2017-07-12 10:00 ` Philipp Zabel [not found] ` <20170711143314.2148-1-maarten.lankhorst-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-07-11 14:33 ` [PATCH v2 03/12] drm/nouveau: " Maarten Lankhorst 2017-07-11 14:33 ` [PATCH v2 07/12] drm/msm: " Maarten Lankhorst 2017-07-14 15:02 ` [Intel-gfx] " Daniel Vetter 2017-07-11 14:33 ` [PATCH v2 08/12] drm/tegra: " Maarten Lankhorst [not found] ` <20170711143314.2148-9-maarten.lankhorst-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-07-14 15:03 ` [Intel-gfx] " Daniel Vetter 2017-07-11 14:33 ` [PATCH v2 09/12] drm/tilcdc: " Maarten Lankhorst 2017-07-27 7:49 ` Jyri Sarha 2017-07-27 10:25 ` Maarten Lankhorst 2017-07-11 14:33 ` [PATCH v2 10/12] drm/vc4: " Maarten Lankhorst 2017-07-14 15:04 ` [Intel-gfx] " Daniel Vetter 2017-07-11 14:33 ` [PATCH v2 11/12] drm/atomic: Add __must_check to drm_atomic_helper_swap_state Maarten Lankhorst 2017-07-14 15:05 ` Daniel Vetter 2017-07-11 14:33 ` [PATCH v2 12/12] drm/atomic: Allow drm_atomic_helper_swap_state to fail Maarten Lankhorst 2017-07-14 15:06 ` [Intel-gfx] " Daniel Vetter 2017-07-11 15:11 ` ✗ Fi.CI.BAT: warning for drm/atomic: Make drm_atomic_helper_swap_state waiting interruptible Patchwork 2017-07-14 15:01 ` [PATCH v2 00/12] " Sean Paul 2017-07-19 10:10 ` Maarten Lankhorst
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=20170711143314.2148-7-maarten.lankhorst@linux.intel.com \ --to=maarten.lankhorst@linux.intel.com \ --cc=ck.hu@mediatek.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=p.zabel@pengutronix.de \ /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.