From patchwork Wed Apr 30 13:41:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Sharma X-Patchwork-Id: 4093951 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 191E99F169 for ; Wed, 30 Apr 2014 13:43:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4D93C202DD for ; Wed, 30 Apr 2014 13:43:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1974D201C0 for ; Wed, 30 Apr 2014 13:43:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758318AbaD3NnU (ORCPT ); Wed, 30 Apr 2014 09:43:20 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:36569 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757878AbaD3NnT (ORCPT ); Wed, 30 Apr 2014 09:43:19 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N4U00M8ZJG5EDD0@mailout2.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 30 Apr 2014 22:43:18 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.125]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id A2.7A.14563.5FDF0635; Wed, 30 Apr 2014 22:43:17 +0900 (KST) X-AuditID: cbfee68e-b7fd86d0000038e3-e7-5360fdf55ab7 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C8.FA.27725.5FDF0635; Wed, 30 Apr 2014 22:43:17 +0900 (KST) Received: from localhost.localdomain ([107.108.83.245]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N4U00GNIJEXIM20@mmp1.samsung.com>; Wed, 30 Apr 2014 22:43:17 +0900 (KST) From: Rahul Sharma To: dri-devel@lists.freedesktop.org Cc: linux-samsung-soc@vger.kernel.org, inki.dae@samsung.com, joshi@samsung.com, r.sh.open@gmail.com, Rahul Sharma Subject: [PATCH] drm/exynos: fix nested calls to lock mutex in drm resume Date: Wed, 30 Apr 2014 19:11:34 +0530 Message-id: <1398865294-6754-1-git-send-email-rahul.sharma@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsWyRsSkVvfr34Rggzt3LCyufH3PZjHp/gQW i++7vrBbzDi/j8li4Yt4iymLDrM6sHnsnHWX3eN+93Emj74tqxg9Pm+SC2CJ4rJJSc3JLEst 0rdL4Mr4sHUVW8Fe9oojfy6xNzCuYuti5OSQEDCRaJ25hxHCFpO4cG89UJyLQ0hgKaPEg18T WGGKLrZsY4JILGKUuNwylxXCaWeS+Dp3AVg7m4CuxOyDz8BsEQFlib8TVzGCFDEL9DFKfLr1 nRkkISzgKfHmfx+QzcHBIqAq0bzeDiTMK+AucWfOfkaQsISAgsScSTYgrRICn9kkXpx5BnYF i4CAxLfJh1ggamQlNh1ghjhOUuLgihssExgFFzAyrGIUTS1ILihOSi8y0itOzC0uzUvXS87P 3cQIDNDT/5717WC8ecD6EGMy0LiJzFKiyfnAAM8riTc0NjOyMDUxNTYytzQjTVhJnHfRw6Qg IYH0xJLU7NTUgtSi+KLSnNTiQ4xMHJxSDYyCtZdq59xNmCb803SO9tE118VuhGlL7XER1JE+ /i1K4NYE/1gr5gWFbF2qK0wuy5nsmvb4ydNgoR+zTwt9vGXfcymEV/aHztQp/i7Xkuf+uPK+ JaZsV7FZzjfmBOFQWSG/3SHTddjckx79WVnD/6RyqYPLppBf3a+e+sqY88nm3usIk9z7w1eJ pTgj0VCLuag4EQAwVFS9ZgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsVy+t9jAd2vfxOCDW7/1LO48vU9m8Wk+xNY LL7v+sJuMeP8PiaLhS/iLaYsOszqwOaxc9Zddo/73ceZPPq2rGL0+LxJLoAlqoHRJiM1MSW1 SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwdouZJCWWJOKVAoILG4 WEnfDtOE0BA3XQuYxghd35AguB4jAzSQsIYx48PWVWwFe9krjvy5xN7AuIqti5GTQ0LAROJi yzYmCFtM4sK99UBxLg4hgUWMEpdb5rJCOO1MEl/nLmAEqWIT0JWYffAZmC0ioCzxd+IqRpAi ZoE+RolPt74zgySEBTwl3vzvA7I5OFgEVCWa19uBhHkF3CXuzNnPCBKWEFCQmDPJZgIj9wJG hlWMoqkFyQXFSem5hnrFibnFpXnpesn5uZsYweH/TGoH48oGi0OMAhyMSjy8Alvjg4VYE8uK K3MPMUpwMCuJ8PLdTwgW4k1JrKxKLcqPLyrNSS0+xJgMtHsis5Rocj4wNvNK4g2NTcxNjU0t TSxMzCxJE1YS5z3Qah0oJJCeWJKanZpakFoEs4WJg1OqgbGz8n+8VNWMwB3THxad9Xu0XIN7 apmeYuiCX40zFUS+lr05+MjmzKZ1N/lMTL5xFDiKJ7xueBIrKMP7Ys59u8cOITxfxPlPVN1+ tL/0SnXTs19afo+nsdoViMZysB6TfyqmEtop4x8h97Eo2GensVXtDtnbWpx/msq6dtQcdq/Y 3ut34GeDnBJLcUaioRZzUXEiAJLV1KLDAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rahul Sharma While testing S2R on exynos board, system is hanging and rebooting due to nested mutex_lock calls in exynos drm resume callback. Changing the order of the calls is fixing the issue. Signed-off-by: Rahul Sharma --- Based on exynos-drm-next branch in Inki Dae's tree. drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index bb7dfee..2bb6233 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -184,8 +184,8 @@ static int exynos_drm_resume(struct drm_device *dev) connector->funcs->dpms(connector, connector->dpms); } - drm_helper_resume_force_mode(dev); drm_modeset_unlock_all(dev); + drm_helper_resume_force_mode(dev); return 0; }