From patchwork Fri May 6 13:20:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9033151 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B20F09F39D for ; Fri, 6 May 2016 13:20:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B84282038F for ; Fri, 6 May 2016 13:20:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A478620392 for ; Fri, 6 May 2016 13:20:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE3856EABE; Fri, 6 May 2016 13:20:50 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [87.106.93.118]) by gabe.freedesktop.org (Postfix) with ESMTP id 2CF8D6EABB; Fri, 6 May 2016 13:20:49 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from nuc-i3427.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 59283885-1500048 for multiple; Fri, 06 May 2016 14:20:47 +0100 Received: by nuc-i3427.alporthouse.com (sSMTP sendmail emulation); Fri, 06 May 2016 14:20:35 +0100 Date: Fri, 6 May 2016 14:20:35 +0100 From: Chris Wilson To: Daniel Vetter Subject: Re: [PATCH] drm/i915: Correctly refcount connectors in hw state readou Message-ID: <20160506132035.GA30822@nuc-i3427.alporthouse.com> Mail-Followup-To: Chris Wilson , Daniel Vetter , DRI Development , Intel Graphics Development , Gabriel Feceoru , Marius Vlad , Dave Airlie References: <1462540183-13072-1-git-send-email-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1462540183-13072-1-git-send-email-daniel.vetter@ffwll.ch> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Gabriel Feceoru , Intel Graphics Development , Dave Airlie , DRI Development 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=-6.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 On Fri, May 06, 2016 at 03:09:43PM +0200, Daniel Vetter wrote: > This was forgotten when adding the the refcounting to > drm_connector_state. > > Cc: Gabriel Feceoru > Cc: Chris Wilson > Cc: Marius Vlad > Cc: Dave Airlie > Fixes: d2307dea14a4 ("drm/atomic: use connector references (v3)") > --- > drivers/gpu/drm/i915/intel_display.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 45c218db86be..d26429c77c10 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -12028,6 +12028,8 @@ static void intel_modeset_update_connector_atomic_state(struct drm_device *dev) > connector->base.encoder; > connector->base.state->crtc = > connector->base.encoder->crtc; > + > + drm_connector_reference(&connector->base); Right that matches d2307dea14a4 but do we have to worry about balance here? diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8ae5a8ac3b7b..49c4f5e77d32 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11947,14 +11947,18 @@ static void intel_modeset_update_connector_atomic_state(struct drm_device *dev) struct intel_connector *connector; for_each_intel_connector(dev, connector) { + if (connector->base.state->crtc) { + connector->base.state->best_encoder = NULL; + connector->base.state->crtc = NULL; + drm_connector_unreference(&connector->base); + } + if (connector->base.encoder) { - connector->base.state->best_encoder = - connector->base.encoder; + drm_connector_reference(&connector->base); connector->base.state->crtc = connector->base.encoder->crtc; - } else { - connector->base.state->best_encoder = NULL; - connector->base.state->crtc = NULL; + connector->base.state->best_encoder = + connector->base.encoder; } } }