From patchwork Wed Mar 1 09:52:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9598001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B78B0604DC for ; Wed, 1 Mar 2017 09:52:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 876C828306 for ; Wed, 1 Mar 2017 09:52:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78CE828532; Wed, 1 Mar 2017 09:52:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 405D028306 for ; Wed, 1 Mar 2017 09:52:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 16B136E8EF; Wed, 1 Mar 2017 09:52:42 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 17CDC6E8E9 for ; Wed, 1 Mar 2017 09:52:39 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id l37so4765004wrc.3 for ; Wed, 01 Mar 2017 01:52:39 -0800 (PST) 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=eWnbvHdXwJM0B0Y4D9K5ysDYeYpVtuHxl0Z8yU8nagw=; b=lq4Ocn0QPT6RloDaX8mKbpkpRzYt5fEgxh8BUHI0uJG09HU+qsBngACoAL+x1YvqTx aMx1qCCb6+xv22tAAZ8yNi1Enrl71GlwmrS4QcS3P33J0WP/l3lXO0/tbiQgn7dxfipo suJUzlRaZSSWjWEUC9b26Sxk6kRw/xZmcs7xE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eWnbvHdXwJM0B0Y4D9K5ysDYeYpVtuHxl0Z8yU8nagw=; b=n5SpWolW72eCZOtyl9RaRZBfC7WnSWnP47Pn0BtdW2CDAbfbkkPCfVFTZFRmVz6ST+ QsGmed7cwst6OG9Dm83YlCRMDe0bsGC/87Xcnu0rSqSVXOVmAhqsOW14UMwHugXm+KQZ AIl//HGBozFMA+rrvvz+KcTRimgiCMjaSst4rclLQkvxjqQ3srPMHOjlGQQjU2peXaeP ///CIgmFbc55ndgaggXnucuBPASDHOIuVItQt/aCgpJ2tgQsyHhpJEpwx51PTWqUOIbP 5JUuxYkTIJnmxYEiHhHnIrKd8ZchFbIksZQ1oJifjQgQ5p4RPRoQle4D257XjvharavE kRng== X-Gm-Message-State: AMke39l2LsyvcnGZoDZuiKQdC/q/cTsRvWkRlC73L/azYPQ+D9QTzNPdSfmpMA9ODKnwYg== X-Received: by 10.223.136.253 with SMTP id g58mr7038129wrg.10.1488361957338; Wed, 01 Mar 2017 01:52:37 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56c9:0:decc:6e78:7e96:b452]) by smtp.gmail.com with ESMTPSA id 63sm6190479wmg.22.2017.03.01.01.52.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 01:52:36 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 1 Mar 2017 10:52:24 +0100 Message-Id: <20170301095226.30584-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170301095226.30584-1-daniel.vetter@ffwll.ch> References: <20170301095226.30584-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter Subject: [Intel-gfx] [PATCH 4/6] drm/i915: Make intel_get_pipe_from_connector atomic X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Drive-by fixup while looking at all the connector_list walkers - holding connection_mutex does actually _not_ give you locking to look at the legacy drm_connector->encoder->crtc pointer chain. That one is solely owned by the atomic commit workers. Instead we must inspect the atomic state. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7673d5d9e74a..0f30362b4ad8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13875,15 +13875,14 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) enum pipe intel_get_pipe_from_connector(struct intel_connector *connector) { - struct drm_encoder *encoder = connector->base.encoder; struct drm_device *dev = connector->base.dev; WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); - if (!encoder || WARN_ON(!encoder->crtc)) + if (!connector->base.state->crtc) return INVALID_PIPE; - return to_intel_crtc(encoder->crtc)->pipe; + return to_intel_crtc(connector->base.state->crtc)->pipe; } int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,