From patchwork Wed Mar 27 20:45:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2353141 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 34BB1DFE82 for ; Wed, 27 Mar 2013 20:43:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 07B0EE6364 for ; Wed, 27 Mar 2013 13:43:02 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 43A60E5D09 for ; Wed, 27 Mar 2013 13:42:51 -0700 (PDT) Received: by mail-ea0-f177.google.com with SMTP id q14so1259414eaj.36 for ; Wed, 27 Mar 2013 13:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=Re4fOctEXxqo1RUQqqEO6VD08/ooZwxQsWJ2Ns2F8uU=; b=Ou5Avk2W9ygwdYa55lObk8izD8eo3smdIBVGFmzhDvi/AqgnMo8cm17FM0/y+qum9M fGNbpHdMHYCTFZLB+CmfKVbRawK+F55cvKYndM3ffhg70dMsOISVg8FFSs1d6IRZIsbV UsZKFQZBXi+40lbNW125v7jUdw/qoHM53mcns= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=Re4fOctEXxqo1RUQqqEO6VD08/ooZwxQsWJ2Ns2F8uU=; b=MhAl7TEk3P/iEtFnjrG0ybA3gJ+SFThnAk7JPKJyPXfZrKTjv9h1sWdylz4goPx5rJ yipwm9zg4AHLF06AbU8O7BhIyZQTQU1YbhDdN09oXvl8+wjvY4oB/LmvAT5+5iRkqdT7 TukSBxX+eeOB98YyGjE7ct4UL4TAUygumTYkNLHO2YmnhH4mFfycHuimFm5VE3iJp0Rd yh787Uvag9VCvXjrLHVYUFQzuQMUBeo7Qk0BI5rY34uRe5VK7tUCiOptRZFP4Bdy3VR6 8uLiYkKt+RVmS6EpruB/gW10lDFTWJcTT8hO5UvRPgv1ngb7+c5Xzdftn09XiafC1FS1 SXRQ== X-Received: by 10.14.109.71 with SMTP id r47mr32739385eeg.25.1364416970035; Wed, 27 Mar 2013 13:42:50 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id 44sm33663840eek.5.2013.03.27.13.42.47 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 27 Mar 2013 13:42:48 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm: don't unlock in the addfb error paths Date: Wed, 27 Mar 2013 21:45:35 +0100 Message-Id: <1364417135-30928-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQnHyN6WJTicvFMkhHCjTu8OgtZoE4HOeAjgZ7Drb2OX2tM9FF7H3xNFcZoFqsaB1j7Ddh7C Cc: Daniel Vetter , Ray Strode X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org We don't grab the modeset locks any more since commit 468174f748603497e73dba9b5c6d1d9f71121486 Author: Daniel Vetter Date: Tue Dec 11 00:09:12 2012 +0100 drm: push modeset_lock_all into ->fb_create driver callbacks Reported-by: Ray Strode Cc: Ray Strode Cc: Dave Airlie Signed-off-by: Daniel Vetter Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/drm_crtc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 792c3e3..dd64a06 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2326,7 +2326,6 @@ int drm_mode_addfb(struct drm_device *dev, fb = dev->mode_config.funcs->fb_create(dev, file_priv, &r); if (IS_ERR(fb)) { DRM_DEBUG_KMS("could not create framebuffer\n"); - drm_modeset_unlock_all(dev); return PTR_ERR(fb); } @@ -2506,7 +2505,6 @@ int drm_mode_addfb2(struct drm_device *dev, fb = dev->mode_config.funcs->fb_create(dev, file_priv, r); if (IS_ERR(fb)) { DRM_DEBUG_KMS("could not create framebuffer\n"); - drm_modeset_unlock_all(dev); return PTR_ERR(fb); }