From patchwork Tue Dec 13 23:08:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9473339 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 2E4D560476 for ; Tue, 13 Dec 2016 23:09:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 210D028285 for ; Tue, 13 Dec 2016 23:09:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13EDB28403; Tue, 13 Dec 2016 23:09:39 +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=unavailable 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 6600228285 for ; Tue, 13 Dec 2016 23:09:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CF3516E6C3; Tue, 13 Dec 2016 23:09:00 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wj0-x243.google.com (mail-wj0-x243.google.com [IPv6:2a00:1450:400c:c01::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 79A4B6E6C8 for ; Tue, 13 Dec 2016 23:08:37 +0000 (UTC) Received: by mail-wj0-x243.google.com with SMTP id xy5so508253wjc.1 for ; Tue, 13 Dec 2016 15:08:37 -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=RFuADEQdIYVEzxTu+3+lXNXKoPTlgc59mb05nWpoxCQ=; b=c3WcYzT1yXaJjrDTpYi1fWdGqR8Flyj17Oafff0yMmpPpOg/aWbjBpkUIAi7zCR7DL XhAPqFeKkJxvgXcofeHU4wvrPVw+Ftq0DkX0mKQsnEUB4D4ARp1dbfrA0k0x4c54Srsh u6vYJlBT5AztoAVrsRF4YVxW0kODDsQpUHRxM= 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=RFuADEQdIYVEzxTu+3+lXNXKoPTlgc59mb05nWpoxCQ=; b=K99UstF/CEf0AOOnKl/rw0pj0qjb1gYq6IpNnbxd7rKu469EzXJXkNzVW86aQXsTL6 LT86z0ZdELJXa6c4K1LK1YvKoYhC2V1i3GWp20vEEgWPolhLc0XyDRuDY8sAgHBDIh4k CXQ8SZtu/b898slnavD8VbA2Dx+m39I7Wo1nqcrhS0myxXn32oEdoHOjRoI8dJ2tOMDM bGoJDhHb0ycTciq2t1YLcUzz8gGPW6dhV+DQ41XCgtzp7Jz04giJF+EiWLF3mB8RFjLR GlSQFwHTiP97ya6nP7WD7uqpntMlr+kgQrgCMlyhZY7kt//nA1KWfod5b8to0YW8E5+u T7/A== X-Gm-Message-State: AKaTC03ex1ITKbwoOGyzu8p9U5jRWysc0J57bgBFPdOgzmqBsXOO+5M15PnhoRpIUpIGww== X-Received: by 10.194.133.169 with SMTP id pd9mr84014154wjb.199.1481670515759; Tue, 13 Dec 2016 15:08:35 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id ke6sm64350375wjb.21.2016.12.13.15.08.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2016 15:08:35 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Wed, 14 Dec 2016 00:08:14 +0100 Message-Id: <20161213230814.19598-14-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161213230814.19598-1-daniel.vetter@ffwll.ch> References: <20161213230814.19598-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 13/13] 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 bc1af87789bc..b0ce4204631d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15424,15 +15424,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,