From patchwork Thu Jul 9 21:32:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6760081 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 37225C05AD for ; Thu, 9 Jul 2015 21:30:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 54EEF207A1 for ; Thu, 9 Jul 2015 21:30:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 715D720790 for ; Thu, 9 Jul 2015 21:30:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 97BCB7A09E; Thu, 9 Jul 2015 14:30:40 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0150D7A09B for ; Thu, 9 Jul 2015 14:30:38 -0700 (PDT) Received: by wgck11 with SMTP id k11so234292176wgc.0 for ; Thu, 09 Jul 2015 14:30:36 -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 :mime-version:content-type:content-transfer-encoding; bh=P61yExjYXQgBezUFzdbls9qYcXKxsvp/gaJEGogA4rw=; b=Oznia1JAqDa9nOPm2oLiC3F+Jf6ahe6g4DuenlQM0CNIvPyI99iVMH30gfVQC6pOAw u12APipiMqA5bjwCTRaIjA0LtimMYan9taQM7gLyXpd4+/SvkPhv6okg1aeJ+IsV7jkX rugYfmOgolT9Tno7J8BDO6MnP+5crZS6VSeT8= 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:mime-version:content-type:content-transfer-encoding; bh=P61yExjYXQgBezUFzdbls9qYcXKxsvp/gaJEGogA4rw=; b=gmcS4XwqxTIKDSF1yPy64lDbZjgzby+6skRVD10Bp+t2wooBGKdWe3J/Q7Kb0Snwpo dXtMmsvvrqBQm+Gn+uowjb7bZ/tG4/ZMRrGVU7i46sjUJ1u+yzpZd33P1yhWraM9RG64 4OmIFGoBAqpFevf60hMGiLEkyCXy4SSRFnTA0tvtR++gKxTWKwtDbktn29sDg16unfDW 2YBNQ9UyYoeisVPW3zYJQALSM7tVTY1XDJczjx+z0ky4qN6CFemjEgxpn1WhEevOxrso 5SYbY1sWdRdrC+o/0S9Dakz0m4YDZIYFjG6LwdTrPFdxjlj1rsIl0cZcFzyn8hfIwTH9 sF1g== X-Gm-Message-State: ALoCoQkMOCnldWE8JRKISBdlQWsNGaNM79rq4MWlTnk2IOxfcW4N7w0cisqIDmB6jgyJPjMwwjs6 X-Received: by 10.180.9.7 with SMTP id v7mr89512144wia.60.1436477436771; Thu, 09 Jul 2015 14:30:36 -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 j6sm3004128wix.5.2015.07.09.14.30.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:30:36 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 16/18] drm/radeon: Don't take dev->struct_mutex in pm functions Date: Thu, 9 Jul 2015 23:32:48 +0200 Message-Id: <1436477570-4936-17-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch> References: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Cc: Alex Deucher , Daniel Vetter , Intel Graphics Development , =?UTF-8?q?Christian=20K=C3=B6nig?= , 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 We already grab 2 device-global locks (write-sema rdev->pm.mclk_lock and rdev->ring_lock), adding another global mutex won't serialize this code more. And since there's really nothing interesting that gets protected in radeon by dev->struct mutex (we only have the global z buffer owners and it's still serializing gem bo destruction in the drm core - which is irrelevant since radeon uses ttm anyway internally) this doesn't add protection. Remove it. Cc: Alex Deucher Cc: "Christian König" Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/radeon/radeon_pm.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index c1ba83a8dd8c..05751f3f8444 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -253,7 +253,6 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev) (rdev->pm.requested_power_state_index == rdev->pm.current_power_state_index)) return; - mutex_lock(&rdev->ddev->struct_mutex); down_write(&rdev->pm.mclk_lock); mutex_lock(&rdev->ring_lock); @@ -268,7 +267,6 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev) /* needs a GPU reset dont reset here */ mutex_unlock(&rdev->ring_lock); up_write(&rdev->pm.mclk_lock); - mutex_unlock(&rdev->ddev->struct_mutex); return; } } @@ -304,7 +302,6 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev) mutex_unlock(&rdev->ring_lock); up_write(&rdev->pm.mclk_lock); - mutex_unlock(&rdev->ddev->struct_mutex); } static void radeon_pm_print_states(struct radeon_device *rdev) @@ -1062,7 +1059,6 @@ force: radeon_dpm_print_power_state(rdev, rdev->pm.dpm.requested_ps); } - mutex_lock(&rdev->ddev->struct_mutex); down_write(&rdev->pm.mclk_lock); mutex_lock(&rdev->ring_lock); @@ -1113,7 +1109,6 @@ force: done: mutex_unlock(&rdev->ring_lock); up_write(&rdev->pm.mclk_lock); - mutex_unlock(&rdev->ddev->struct_mutex); } void radeon_dpm_enable_uvd(struct radeon_device *rdev, bool enable)