From patchwork Tue Jul 28 11:18:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6883741 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A67049F380 for ; Tue, 28 Jul 2015 11:16:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE3182071C for ; Tue, 28 Jul 2015 11:16:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5F06420722 for ; Tue, 28 Jul 2015 11:16:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FB6F89CCB; Tue, 28 Jul 2015 04:16:11 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02DDD89A0F for ; Tue, 28 Jul 2015 04:16:10 -0700 (PDT) Received: by wicgb10 with SMTP id gb10so151586014wic.1 for ; Tue, 28 Jul 2015 04:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Rv4lqoZ5ieRI5jnl0hALib6shCIzEYBf9XO+Bn7kVh0=; b=X/xelpB3Yjs+ZrxdTKwuizenqX0smMyQcjFZvQGmI5rTCh+p7BS6hZKg2eGJ3ELb5a Qu+/gI7w9TF3w8n5sQlJ6vpu3LiLCk+rBep3nGzhbUVGcWzTimqsHsfSxXD2e+kwtXcA XPIQ85jQ565N0N+4y5Ge3AdHQqbFJMFbJAl50= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rv4lqoZ5ieRI5jnl0hALib6shCIzEYBf9XO+Bn7kVh0=; b=WdExbmqyk62zurGxZ0Vesl2S96dze/kaJPYcxUu8cGtUVBE1am2GLS58EEjzom2D09 rfnhL9KYemR8qgVxEcDiODCN5i2kqMb1scCDFkMdLVJ/NzHEAscsnmN+XIo165jU0iDh wZedwJSFQ3xrID7tk+SelScOi9UxE7RsWXpkRQ7G6dwJ10fiIp+0GOkwjIZw6mBIJCzD q0ZOIwvu9dESbfV1deoATaSzWvSZFMnPZZhh0wAeboXlwupB6UpyGvmgDkwrNnQxz4NW FjnVFS0moRtY3SLW+nkl5JGOsJZW3poMDEVcEiNKQqV1QHH8n3k8NBd2QR5iZJG6Hygf NBGw== X-Gm-Message-State: ALoCoQnAkXLoB+1fLytVQJLGU/zhl1F2Hv9OFd9UkQEsn0vDzDsDGoFhHW1UQpoG+0hr/JQlFMmm X-Received: by 10.194.121.163 with SMTP id ll3mr67136030wjb.142.1438082168377; Tue, 28 Jul 2015 04:16:08 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id ef10sm32738408wjd.49.2015.07.28.04.16.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jul 2015 04:16:07 -0700 (PDT) From: Daniel Vetter To: DRI Development , Intel Graphics Development Subject: [PATCH 2/3] drm/fb-helper: Stop using trylocks in force_restore Date: Tue, 28 Jul 2015 13:18:41 +0200 Message-Id: <1438082322-21583-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1438082322-21583-1-git-send-email-daniel.vetter@ffwll.ch> References: <1438082322-21583-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Since the panic handling is gone this is only used for force-restoring the fbdev/fbcon from sysrq, and that's done with a work item. No need any more to do trylocks, we can just do normal locking. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_fb_helper.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 77f570a470da..a9043ab7f58b 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -416,19 +416,10 @@ static bool drm_fb_helper_force_kernel_mode(void) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) continue; - /* - * NOTE: Use trylock mode to avoid deadlocks and sleeping in - * panic context. - */ - if (__drm_modeset_lock_all(dev, true) != 0) { - error = true; - continue; - } - + drm_modeset_lock_all(dev); ret = drm_fb_helper_restore_fbdev_mode(helper); if (ret) error = true; - drm_modeset_unlock_all(dev); } return error;