From patchwork Thu Dec 1 15:52:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jyri Sarha X-Patchwork-Id: 9456485 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 0650D60585 for ; Thu, 1 Dec 2016 15:52:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE6A0284F9 for ; Thu, 1 Dec 2016 15:52:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E338D284FC; Thu, 1 Dec 2016 15:52:27 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 A8573284F9 for ; Thu, 1 Dec 2016 15:52:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 466DA6E7AF; Thu, 1 Dec 2016 15:52:20 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lelnx194.ext.ti.com (lelnx194.ext.ti.com [198.47.27.80]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A9096E7A4 for ; Thu, 1 Dec 2016 15:52:19 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id uB1FqGMU016211; Thu, 1 Dec 2016 09:52:16 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id uB1FqG2A007722; Thu, 1 Dec 2016 09:52:16 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.294.0; Thu, 1 Dec 2016 09:52:15 -0600 Received: from jadmar.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id uB1Fq8Bh020069; Thu, 1 Dec 2016 09:52:14 -0600 From: Jyri Sarha To: Subject: [PATCH RFC 3/3] drm/tilcdc: Adapt to bridge object refcounting Date: Thu, 1 Dec 2016 17:52:06 +0200 Message-ID: <9e7ececc0e0954e9608cfcd5e173adda0de6594b.1480603126.git.jsarha@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: MIME-Version: 1.0 Cc: Jyri Sarha , tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com 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-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jyri Sarha --- drivers/gpu/drm/tilcdc/tilcdc_external.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tilcdc/tilcdc_external.c b/drivers/gpu/drm/tilcdc/tilcdc_external.c index 80184f0..31c6092 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_external.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_external.c @@ -154,8 +154,10 @@ void tilcdc_remove_external_device(struct drm_device *dev) drm_connector_helper_add(priv->external_connector, priv->connector_funcs); - if (priv->external_encoder && priv->external_encoder->bridge) + if (priv->external_encoder && priv->external_encoder->bridge) { drm_bridge_detach(priv->external_encoder->bridge); + drm_bridge_put(priv->external_encoder->bridge); + } } static const struct drm_encoder_funcs tilcdc_external_encoder_funcs = { @@ -234,7 +236,7 @@ int tilcdc_attach_external_device(struct drm_device *ddev) if (!remote_node) return 0; - bridge = of_drm_find_bridge(remote_node); + bridge = of_drm_get_bridge(remote_node); of_node_put(remote_node); if (!bridge) return -EPROBE_DEFER; @@ -242,20 +244,25 @@ int tilcdc_attach_external_device(struct drm_device *ddev) priv->external_encoder = devm_kzalloc(ddev->dev, sizeof(*priv->external_encoder), GFP_KERNEL); - if (!priv->external_encoder) + if (!priv->external_encoder) { + drm_bridge_put(bridge); return -ENOMEM; + } ret = drm_encoder_init(ddev, priv->external_encoder, &tilcdc_external_encoder_funcs, DRM_MODE_ENCODER_NONE, NULL); if (ret) { dev_err(ddev->dev, "drm_encoder_init() failed %d\n", ret); + drm_bridge_put(bridge); return ret; } ret = tilcdc_attach_bridge(ddev, bridge); - if (ret) + if (ret) { drm_encoder_cleanup(priv->external_encoder); + drm_bridge_put(bridge); + } return ret; }