From patchwork Tue Aug 9 10:51:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 9270843 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 763A76082E for ; Tue, 9 Aug 2016 10:52:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 673062711E for ; Tue, 9 Aug 2016 10:52:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C00B27F8D; Tue, 9 Aug 2016 10:52:28 +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 A5AAA2711E for ; Tue, 9 Aug 2016 10:52:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EF0636E43E; Tue, 9 Aug 2016 10:52:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id C6BFF6E432 for ; Tue, 9 Aug 2016 10:52:23 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id q128so2317749wma.1 for ; Tue, 09 Aug 2016 03:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=JIJVSxIVRfsEVOlp425jz2Ejdd0dizgSeJ1uprOE3yU=; b=wJ1lAhon7Z0puvVdcKmNXv7WhVEWVzUMwUURO1RIILXzD/gq6U5OJgHh+NzIF9dqVO JRaWUMfBN4nnrSroll2cvIsCig8nKSjnR1OnWX7yPs5Ih+9T+3Ke3AX2UCd5t6RHLsYM ttnNSYayCD6piPX8TC/z0CBOh2pk8SIhRIWgssrLyqMxnWpanjMnQPQMg76eFDJIgSqW XSOOmwQpxbnFJbkAotRPRZYpLruyYm3mK5tylqZcZU80cDpyqwja9pEhdR78pkf55oZ+ Y5/igLkFnhAP1h/jCr61LXXleSVo0HR3jQPCm5I5a7TAcnu/QVCl3DyR54OxDiB3dBF4 tOCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=JIJVSxIVRfsEVOlp425jz2Ejdd0dizgSeJ1uprOE3yU=; b=h6p9yl43xw3Z1k3xvzp0WnvwQGp1BmS5OARSv11yXAlmrxotI3ZJn4VfFnr36W6ewA lxKQuH675gllE9J46LThNGdncNi5Y94z1Y5AG5PlcAXAPlC628iQuKkQ7b7uJUpyfFZl 5gf57Q1IxBaK2fTm1ma/nNWStmmLPxvOYeyQy+AYypWqYESpiQIOF46MyAjkZ0TWpRq4 OxmdNFWd1PswnlOLox8/STif4guO4bpnZjP/CYvanK8nU5hv2A2nqSB8xYwGzek4Bf3N jayggC2M4p3NyanQT8Sz+mpEA2hXweTwCFLpHV0TCSZ0JMspqcrsLjMl8yQib66iHzQA 8Eyw== X-Gm-Message-State: AEkoousWz6EfKHvHZOa89FgqxeNX6OLCXzBfjLEDPA+2TOKf4Ojyd65kWPddYcmYCQwkEw== X-Received: by 10.194.106.200 with SMTP id gw8mr13574754wjb.147.1470739942327; Tue, 09 Aug 2016 03:52:22 -0700 (PDT) Received: from cizrna.lan ([109.72.12.53]) by smtp.gmail.com with ESMTPSA id q4sm37404825wjk.24.2016.08.09.03.52.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Aug 2016 03:52:21 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v1 2/5] drm/bridge: analogix_dp: set connector to drm_dp_aux Date: Tue, 9 Aug 2016 12:51:33 +0200 Message-Id: <1470739896-11088-3-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470739896-11088-1-git-send-email-tomeu.vizoso@collabora.com> References: <1470739896-11088-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Tomeu Vizoso , dri-devel@lists.freedesktop.org, Daniel Vetter , Emil Velikov 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-Virus-Scanned: ClamAV using ClamSMTP Set the backpointer so that the DP helpers are able to access the connector that the drm_dp_aux is associated with. Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 624fc4f44450..42fc046e4e9d 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1232,23 +1232,25 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, dp->drm_dev = drm_dev; dp->encoder = dp->plat_data->encoder; + ret = analogix_dp_create_bridge(drm_dev, dp); + if (ret) { + DRM_ERROR("failed to create bridge (%d)\n", ret); + goto err_encoder_cleanup; + } + dp->aux.name = "DP-AUX"; dp->aux.transfer = analogix_dpaux_transfer; dp->aux.dev = &pdev->dev; + dp->aux.connector = &dp->connector; ret = drm_dp_aux_register(&dp->aux); if (ret) - goto err_disable_pm_runtime; - - ret = analogix_dp_create_bridge(drm_dev, dp); - if (ret) { - DRM_ERROR("failed to create bridge (%d)\n", ret); - drm_encoder_cleanup(dp->encoder); - goto err_disable_pm_runtime; - } + goto err_encoder_cleanup; return 0; +err_encoder_cleanup: + drm_encoder_cleanup(dp->encoder); err_disable_pm_runtime: pm_runtime_disable(dev);