From patchwork Thu Jan 5 13:06:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 90014 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp8958547qgi; Thu, 5 Jan 2017 05:08:11 -0800 (PST) X-Received: by 10.98.152.212 with SMTP id d81mr67726092pfk.12.1483621691619; Thu, 05 Jan 2017 05:08:11 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m24si75953503pfg.258.2017.01.05.05.08.11; Thu, 05 Jan 2017 05:08:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033755AbdAENIG (ORCPT + 25 others); Thu, 5 Jan 2017 08:08:06 -0500 Received: from mail-wj0-f193.google.com ([209.85.210.193]:36491 "EHLO mail-wj0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966082AbdAENHk (ORCPT ); Thu, 5 Jan 2017 08:07:40 -0500 Received: by mail-wj0-f193.google.com with SMTP id j10so79242317wjb.3 for ; Thu, 05 Jan 2017 05:07:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=3PjHm7tqZGhb0Epvc6wOpAO9MzFTwmS8cmOX4PbP8IE=; b=Lf0QjaOefmfNZGOkr0SGM+z28SbniYH3YAhlUtGFd3X7HYVYdse8g67CSJ7dC628Gg 01Xf9+32pj04pPye5WOQaUs+pJqEHiQKom1Bq0fLyJ4NzoPZQquuVHBC1q/E8lDkyXqG cYvG6matAaMhwxMKQ0y7GOoBrhqIFtcJm8arJbNuIB5FKNsvA2siyaxdFwU/+EvuiepU TouLMtfdzO+mneGL9mSTFqCiOnmDsNfg0s9HNRkvggzQqqrpQlAVqY1MNR/C6IvP+9Oe boWpvIX4S3bnd/KVZ41InTWP9OPI2uvtjkAEqH17cWHd32nPRphIX5qe11ge6IRELUTk kfkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=3PjHm7tqZGhb0Epvc6wOpAO9MzFTwmS8cmOX4PbP8IE=; b=fY6RGHaB3ACqaoq1sanWEtpSZvzORzrRGUhiAY+WoIijLs2g0ifRW+w+LR4J/8AvVT /gkk2wvw2ThBZWsUAmWXsSjjKAKkdluEQGUswoCobEdcgYPgESCmDIVNKz1fxyD9VKDm hutdar345jPKYp7mMhWScS0oB3qQEyjbKbOTQ7K4SWC+hnzgK64xVWFI+j+afF/+fjOS gosAKwImtoveuonbglh4WMHgu9fC0cI7y30DND+HhS1PHHQM1ZCl/VpMJ7KCmf4lm/L3 fwwuPH8ew16Wxfb8vhpmjs2gslVE0/Yp9GG+nOG7FshuK8lj11MYjsKEeCb8QkqcEVE7 MxuQ== X-Gm-Message-State: AIkVDXIvE3x8WwuWKFOwLIiQ+uHdn7QoeOg7JN1tzBEWcd+i4kxtlcl2e6gvtQapb2F+/w== X-Received: by 10.194.90.83 with SMTP id bu19mr61050360wjb.68.1483621658768; Thu, 05 Jan 2017 05:07:38 -0800 (PST) Received: from cizrna.lan ([109.72.12.216]) by smtp.gmail.com with ESMTPSA id b3sm103716992wjy.40.2017.01.05.05.07.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jan 2017 05:07:37 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Thierry Reding , intel-gfx-trybot@lists.freedesktop.org, Emil Velikov , Daniel Vetter , Benjamin Gaignard , Tomeu Vizoso , Archit Taneja , David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/5] drm/bridge: analogix_dp: set connector to drm_dp_aux Date: Thu, 5 Jan 2017 14:06:45 +0100 Message-Id: <20170105130648.3139-3-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170105130648.3139-1-tomeu.vizoso@collabora.com> References: <20170105130648.3139-1-tomeu.vizoso@collabora.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.3 diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 02b97bf64ee4..7d45d3e4600a 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1402,23 +1402,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);