From patchwork Fri Mar 10 04:32:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 9614727 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 22C4C60415 for ; Fri, 10 Mar 2017 04:43:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14B9228678 for ; Fri, 10 Mar 2017 04:43:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0947A286EF; Fri, 10 Mar 2017 04:43:35 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A901528678 for ; Fri, 10 Mar 2017 04:43:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=lfPX1bO2ZIiznFgW+v3TUbDZ13ABEgiM8ZZZ30cu/bE=; b=tO4nyXQsOC6P1cJw1Xf6YIGCoF 47K7VzHafifXEwOEmgktIv0uraI++OxJhnN2ZjaJi3mTExT1nWSyPwwVoawVPb71KDDjOJxlC44k8 IB2ffne+7N5TcA4fX0fv6PlgrSq31js2AsoyiLn6QMHZZeg8/ahX1W44pz8cdZIHFvl/Tkf8QKq2B bGX0w3CBJ6+8cJQlv622FXZ44Gpbid7B2ldW1Yc6ZIwTwv4UoZleKmIqNUwdtP+R0+a2cP29kxHuk BV8iMRNQGWn0g1FGqJQ+nJJVMivV6bYwyLIFkj8+9OedcsGPVz7BeLUWWc5Ail5sjOxdB+1pRgDdV 7mvtrKXw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cmCOr-00061U-Hc; Fri, 10 Mar 2017 04:43:33 +0000 Received: from mail-qk0-x229.google.com ([2607:f8b0:400d:c09::229]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cmCOc-0005dt-M2 for linux-rockchip@lists.infradead.org; Fri, 10 Mar 2017 04:43:21 +0000 Received: by mail-qk0-x229.google.com with SMTP id 1so151656916qkl.3 for ; Thu, 09 Mar 2017 20:42:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mHOBgGf+vtOkYxQFlLAV2kNolHuV4GLqM9PFd317rEU=; b=EwwyVLB9RpdChBDB/nD2S1Q8knIXFcsZlobDq3xoGg9BIMawaJLWrUxou9h0XnlIf/ KbKwflrxX607XMm+Vr67kSpLsMtqjDFtn2wvcwIV4nwZr7qFG6h+fdhNWZAs/WQExGCb 8etwPU11iNpO4EwiAabuUEFPu06MPgMfvzBPU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mHOBgGf+vtOkYxQFlLAV2kNolHuV4GLqM9PFd317rEU=; b=kd94gY7MCm4Xv1teTRfAvN8Cq+8lydKl+DPRvudPqmgDlEecQp+Py2hh/zjYC4q8bh uHCmgjIyZfvwon0r8XgUGEt33te+N3pXHGtsdX4h+xn2e/YP523naq6UBf1XEf1tIfgi LiXReQTDFqeViGzlIuaZmJSlQUfe9O3+GZDKnSTfUIJlLsO1JMZtvQhOz4ubR3vOoLwy e7+1piFezo0Cskx5tCTXybhSK1HpOTU9SSqfNB8EtyyMvw7VQt/bJGQgDhGVv04g+WlJ Ft5AgPNc0pRETEfxXP/U+LMjz9uzY1Avs+bxibneO6gj/Oi1Coy8SNFSrNphKEsri9bc arwQ== X-Gm-Message-State: AFeK/H0lwufI2RIY4l4luBw8pnOQPJBpQ/LdBJefZI6iyU7TQKPWJQTee97w3GXovhLVKJoe X-Received: by 10.55.192.145 with SMTP id v17mr18435438qkv.3.1489120977751; Thu, 09 Mar 2017 20:42:57 -0800 (PST) Received: from boxwood.roam.corp.google.com (cpe-75-189-128-87.nc.res.rr.com. [75.189.128.87]) by smtp.gmail.com with ESMTPSA id n19sm5697731qtn.35.2017.03.09.20.42.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Mar 2017 20:42:56 -0800 (PST) From: Sean Paul To: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org Subject: [PATCH 39/41] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts Date: Thu, 9 Mar 2017 23:32:54 -0500 Message-Id: <20170310043305.17216-40-seanpaul@chromium.org> X-Mailer: git-send-email 2.12.0.246.ga2ecc84866-goog In-Reply-To: <20170310043305.17216-1-seanpaul@chromium.org> References: <20170310043305.17216-1-seanpaul@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170309_204318_901232_B971E9E6 X-CRM114-Status: GOOD ( 14.20 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , David Airlie , Yakir Yang , "Kristian H . Kristensen" , Archit Taneja , linux-samsung-soc@vger.kernel.org, Joonyoung Shim , Krzysztof Kozlowski , Javier Martinez Canillas , Kukjin Kim , Inki Dae , Sean Paul , linux-arm-kernel@lists.infradead.org, Mark Yao , zain wang , Lin Huang , Tomeu Vizoso , Jingoo Han , Seung-Woo Kim , Douglas Anderson , Tomasz Figa , Kyungmin Park MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Douglas Anderson Some of the platform-specific stuff in rockchip_dp_poweron() needs to happen before the generic code. Some needs to happen after. Let's split the callback in two. Specifically we can't start doing PSR work until _after_ the whole controller is up, so don't set the enable until the end. Cc: Kristian H. Kristensen Signed-off-by: Douglas Anderson [seanpaul added exynos change] Signed-off-by: Sean Paul Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 7 +++++-- drivers/gpu/drm/exynos/exynos_dp.c | 2 +- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 12 ++++++++++-- include/drm/bridge/analogix_dp.h | 3 ++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index a05bc0271188..bc9a0a28ab1d 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1254,8 +1254,8 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp) goto out_dp_clk_pre; } - if (dp->plat_data->power_on) - dp->plat_data->power_on(dp->plat_data); + if (dp->plat_data->power_on_start) + dp->plat_data->power_on_start(dp->plat_data); phy_power_on(dp->phy); @@ -1278,6 +1278,9 @@ static int analogix_dp_set_bridge(struct analogix_dp_device *dp) goto out_dp_init; } + if (dp->plat_data->power_on_end) + dp->plat_data->power_on_end(dp->plat_data); + enable_irq(dp->irq); return 0; diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c index 1ef0be338b85..6b79c3b3802f 100644 --- a/drivers/gpu/drm/exynos/exynos_dp.c +++ b/drivers/gpu/drm/exynos/exynos_dp.c @@ -168,7 +168,7 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) dp->drm_dev = drm_dev; dp->plat_data.dev_type = EXYNOS_DP; - dp->plat_data.power_on = exynos_dp_poweron; + dp->plat_data.power_on_start = exynos_dp_poweron; dp->plat_data.power_off = exynos_dp_poweroff; dp->plat_data.attach = exynos_dp_bridge_attach; dp->plat_data.get_modes = exynos_dp_get_modes; diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index 14f68e792e6f..07dd09e1e32f 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -127,7 +127,7 @@ static int rockchip_dp_pre_init(struct rockchip_dp_device *dp) return 0; } -static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data) +static int rockchip_dp_poweron_start(struct analogix_dp_plat_data *plat_data) { struct rockchip_dp_device *dp = to_dp(plat_data); int ret; @@ -145,6 +145,13 @@ static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data) return ret; } + return ret; +} + +static int rockchip_dp_poweron_end(struct analogix_dp_plat_data *plat_data) +{ + struct rockchip_dp_device *dp = to_dp(plat_data); + return rockchip_drm_psr_activate(&dp->encoder); } @@ -399,7 +406,8 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, dp->plat_data.encoder = &dp->encoder; dp->plat_data.dev_type = dp->data->chip_type; - dp->plat_data.power_on = rockchip_dp_poweron; + dp->plat_data.power_on_start = rockchip_dp_poweron_start; + dp->plat_data.power_on_end = rockchip_dp_poweron_end; dp->plat_data.power_off = rockchip_dp_powerdown; dp->plat_data.get_modes = rockchip_dp_get_modes; dp->plat_data.cleanup = rockchip_dp_cleanup; diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h index c079ca1ffc76..1049ee56ae76 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -30,7 +30,8 @@ struct analogix_dp_plat_data { struct drm_encoder *encoder; struct drm_connector *connector; - int (*power_on)(struct analogix_dp_plat_data *); + int (*power_on_start)(struct analogix_dp_plat_data *); + int (*power_on_end)(struct analogix_dp_plat_data *); int (*power_off)(struct analogix_dp_plat_data *); int (*attach)(struct analogix_dp_plat_data *, struct drm_bridge *, struct drm_connector *);