From patchwork Wed Apr 30 13:02:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Sharma X-Patchwork-Id: 4097891 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F32D3BFF02 for ; Thu, 1 May 2014 07:09:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C5F52034E for ; Thu, 1 May 2014 07:09:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E274520263 for ; Thu, 1 May 2014 07:09:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3EF6D6E27E; Thu, 1 May 2014 00:09:24 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTP id 17AB86EBEF for ; Wed, 30 Apr 2014 06:05:29 -0700 (PDT) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N4U0086VHP4VK80@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Wed, 30 Apr 2014 22:05:28 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.124]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id B6.BC.11496.815F0635; Wed, 30 Apr 2014 22:05:28 +0900 (KST) X-AuditID: cbfee691-b7f3e6d000002ce8-d9-5360f5187097 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 5D.36.27725.715F0635; Wed, 30 Apr 2014 22:05:28 +0900 (KST) Received: from localhost.localdomain ([107.108.83.245]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N4U00IJZHL09B30@mmp2.samsung.com>; Wed, 30 Apr 2014 22:05:27 +0900 (KST) From: Rahul Sharma To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: fix nested calls to lock mutex in drm resume Date: Wed, 30 Apr 2014 18:32:22 +0530 Message-id: <1398862942-6668-1-git-send-email-rahul.sharma@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsWyRsSkRlfia0KwwbabfBZXvr5ns5h0fwKL xfddX9gtZpzfx2Sx8EW8xZRFh1kd2Dx2zrrL7nG/+ziTR9+WVYwenzfJBbBEcdmkpOZklqUW 6dslcGV09v1kL9jHXvF55hHmBsaNbF2MHBwSAiYSu65adDFyApliEhfurQcKc3EICSxllDgz 5xkbRMJE4uH0XnaIxHRGiQN/JjJBOO1MEq8eX2AFqWIT0JWYffAZI4gtIqAs8XfiKkaQImaB PkaJT7e+M4MkhAU8Jd787wOzWQRUJVb97gVr4BVwlzj89yMrxEkKEnMm2YD0Sgh8ZpPY+egE I0S9gMS3yYdYIGpkJTYdYIa4TlLi4IobLBMYBRcwMqxiFE0tSC4oTkovMtUrTswtLs1L10vO z93ECAzQ0/+eTdzBeP+A9SHGZKBxE5mlRJPzgQGeVxJvaGxmZGFqYmpsZG5pRpqwkjhv+qOk ICGB9MSS1OzU1ILUovii0pzU4kOMTBycUg2MgbO8/j0+3ccRP+GXw2Zdo5Sn6yS+iwotiDJW tVtiz2s1QSq225+HTTH/zuGnD+yv2Z24MrFl2cb60C9zhb/GRUyzadVd8fJI46u4Z729MeyT F7i+mbLrrGrC/PxJP4Veup+/HF8Ya/RgY8z7tmulsy8trHq/7wnvrUiuz6ylHL7SjMsmfF6g pMRSnJFoqMVcVJwIACfVmUVmAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsVy+t9jQV2JrwnBBk3rWCyufH3PZjHp/gQW i++7vrBbzDi/j8li4Yt4iymLDrM6sHnsnHWX3eN+93Emj74tqxg9Pm+SC2CJamC0yUhNTEkt UkjNS85PycxLt1XyDo53jjc1MzDUNbS0MFdSyEvMTbVVcvEJ0HXLzAFarqRQlphTChQKSCwu VtK3wzQhNMRN1wKmMULXNyQIrsfIAA0krGHM6Oz7yV6wj73i88wjzA2MG9m6GDk5JARMJB5O 72WHsMUkLtxbDxTn4hASmM4oceDPRCYIp51J4tXjC6wgVWwCuhKzDz5jBLFFBJQl/k5cxQhS xCzQxyjx6dZ3ZpCEsICnxJv/fWA2i4CqxKrfvWANvALuEof/fgQaxAG0TkFiziSbCYzcCxgZ VjGKphYkFxQnpeca6hUn5haX5qXrJefnbmIER8AzqR2MKxssDjEKcDAq8fAKbI0PFmJNLCuu zD3EKMHBrCTCy3c/IViINyWxsiq1KD++qDQntfgQYzLQ8onMUqLJ+cDozCuJNzQ2MTc1NrU0 sTAxsyRNWEmc90CrdaCQQHpiSWp2ampBahHMFiYOTqkGRu99rFurY5n5rifravM+yzdIX2Rw O2lv6IdLa///DtNn3VGrubzU7/p7a+aFfj5rjB/vTrt9dnOymPWzRtWOv5nutyr3XT+b9WDC lkD3SW+qrLyFdhY9neL1rMDzSVmbXJSY2ZGfcywWLhKfL52/8TfHj32KEm09yUZp/FNqObvs E99O6v7dr8RSnJFoqMVcVJwIAI9b4bTEAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Mailman-Approved-At: Thu, 01 May 2014 00:09:22 -0700 Cc: linux-samsung-soc@vger.kernel.org, joshi@samsung.com, Rahul Sharma X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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. Change-Id: I3f3ada8a413a414dca0bbac53cfc5fe3138af4d6 Signed-off-by: Rahul Sharma --- 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; }