From patchwork Thu Jul 9 21:44:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6760311 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 786C1C05AC for ; Thu, 9 Jul 2015 21:42:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96AC420761 for ; Thu, 9 Jul 2015 21:42:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C05FA207A4 for ; Thu, 9 Jul 2015 21:42:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C08C6ED4E; Thu, 9 Jul 2015 14:42:10 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by gabe.freedesktop.org (Postfix) with ESMTPS id 21E006E688 for ; Thu, 9 Jul 2015 14:42:09 -0700 (PDT) Received: by wicmv11 with SMTP id mv11so16537wic.1 for ; Thu, 09 Jul 2015 14:42:07 -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=0ui7P2FzSZkRTB721ttl06JXINMnkH9kdFH0qICB2VU=; b=WKR7YljDnIZweABvQEtdCKi4Qz4NWEsz5udcER3tezG2rdS/8jj41qr7CkQ01mIPek eGzqsEF5utyQOZEZIX9/SKCRsQz0p5QhL2hJlN0obYGDN39UKpvDBvNAlvylvhm5r1Vo 6iptzQd6W1qxZKvMLHTvSXOQIbxQmy1TZKQgs= 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=0ui7P2FzSZkRTB721ttl06JXINMnkH9kdFH0qICB2VU=; b=c0+mJZKGhaukMUr1o18Yzeolua290Xrwe7k4s/V+QFhnHLCxdjOSyfQUYy2NGnnGec 7wV5M0E3bhODwbTYkxZuO3onvis3VDBX4OZ4S6y+6D6enoPxqlfo/f4khY4Lm3rVj8Wq 0xNK20lLovl1otxVDOr8LZqDjaLzVweZ3+OlUkTfYiasUu6PAgXQS03kJY6qZQ1LM29C Cgb9Kde7HalkkobGN0yvPQgZRjvo9p+UVC69dQ1PQPR5Uh5Bh++TsPKVNub4+7ObXyl9 /NMhyWOZ3zcg7AODXKAuNBcake+kO5y2H3OU995+jSHo+OD7M4o4jAdai1Ib42vb+IYV WL/A== X-Gm-Message-State: ALoCoQkuf7kJhFtu+Cn1PeMVjK0Lro1BRqevWLROM56+FYz31jTlDpfaLpwFapJxSuEiUmQjLJE8 X-Received: by 10.195.11.168 with SMTP id ej8mr34771958wjd.150.1436478127802; Thu, 09 Jul 2015 14:42:07 -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 fb3sm10110697wib.21.2015.07.09.14.42.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:42:07 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 09/14] drm/radeon: Take all modeset locks for DP MST hotplug Date: Thu, 9 Jul 2015 23:44:32 +0200 Message-Id: <1436478277-10861-10-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436478277-10861-1-git-send-email-daniel.vetter@ffwll.ch> References: <1436478277-10861-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , 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=-4.4 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 Similar with the i915 take all modeset locks for mst hotplug. This is needed to make sure radeon holds both mode_config.mutex and mode_config.connection_mutex when updating the connector_list, which is the new (interim) locking regime we want for that. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/radeon/radeon_dp_mst.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 257b10be5cda..e649c8ff20a0 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c @@ -286,9 +286,9 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol drm_mode_connector_set_path_property(connector, pathprop); drm_reinit_primary_mode_group(dev); - mutex_lock(&dev->mode_config.mutex); + drm_modeset_lock_all(dev); radeon_fb_add_connector(rdev, connector); - mutex_unlock(&dev->mode_config.mutex); + drm_modeset_unlock_all(dev); drm_connector_register(connector); return connector; @@ -303,12 +303,12 @@ static void radeon_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr, drm_connector_unregister(connector); /* need to nuke the connector */ - mutex_lock(&dev->mode_config.mutex); + drm_modeset_lock_all(dev); /* dpms off */ radeon_fb_remove_connector(rdev, connector); drm_connector_cleanup(connector); - mutex_unlock(&dev->mode_config.mutex); + drm_modeset_unlock_all(dev); drm_reinit_primary_mode_group(dev);