From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jingoo Han" Subject: Re: [RESEND PATCH v6 22/27] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts Date: Tue, 24 Apr 2018 10:02:33 -0400 Message-ID: <000501d3dbd4$e6f238e0$b4d6aaa0$@gmail.com> References: <20180423105003.9004-1-enric.balletbo@collabora.com> <20180423105003.9004-23-enric.balletbo@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180423105003.9004-23-enric.balletbo@collabora.com> Content-Language: en-us List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: 'Enric Balletbo i Serra' , architt@codeaurora.org, inki.dae@samsung.com, thierry.reding@gmail.com, hjc@rock-chips.com, seanpaul@chromium.org, airlied@linux.ie, tfiga@chromium.org, heiko@sntech.de Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Laurent.pinchart@ideasonboard.com, "'Kristian H . Kristensen'" , kernel@collabora.com, m.szyprowski@samsung.com, linux-samsung-soc@vger.kernel.org, rydberg@bitmath.org, krzk@kernel.org, linux-rockchip@lists.infradead.org, kgene@kernel.org, orjan.eide@arm.com, wxt@rock-chips.com, jeffy.chen@rock-chips.com, linux-arm-kernel@lists.infradead.org, wzz@rock-chips.com, hl@rock-chips.com, sw0312.kim@samsung.com, dianders@chromium.org, kyungmin.park@samsung.com, kuankuan.y@gmail.com, hshi@chromium.org List-Id: linux-rockchip.vger.kernel.org T24gTW9uZGF5LCBBcHJpbCAyMywgMjAxOCA2OjUwIEFNLCBFbnJpYyBCYWxsZXRibyBpIFNlcnJh IHdyb3RlOgo+IAo+IEZyb206IERvdWdsYXMgQW5kZXJzb24gPGRpYW5kZXJzQGNocm9taXVtLm9y Zz4KPiAKPiBTb21lIG9mIHRoZSBwbGF0Zm9ybS1zcGVjaWZpYyBzdHVmZiBpbiByb2NrY2hpcF9k cF9wb3dlcm9uKCkgbmVlZHMgdG8KPiBoYXBwZW4gYmVmb3JlIHRoZSBnZW5lcmljIGNvZGUuICBT b21lIG5lZWRzIHRvIGhhcHBlbiBhZnRlci4gIExldCdzCj4gc3BsaXQgdGhlIGNhbGxiYWNrIGlu IHR3by4KPiAKPiBTcGVjaWZpY2FsbHkgd2UgY2FuJ3Qgc3RhcnQgZG9pbmcgUFNSIHdvcmsgdW50 aWwgX2FmdGVyXyB0aGUgd2hvbGUKPiBjb250cm9sbGVyIGlzIHVwLCBzbyBkb24ndCBzZXQgdGhl IGVuYWJsZSB1bnRpbCB0aGUgZW5kLgo+IAo+IENjOiBLcmlzdGlhbiBILiBLcmlzdGVuc2VuIDxo b2Vnc2JlcmdAY2hyb21pdW0ub3JnPgo+IFNpZ25lZC1vZmYtYnk6IERvdWdsYXMgQW5kZXJzb24g PGRpYW5kZXJzQGNocm9taXVtLm9yZz4KPiBbc2VhbnBhdWwgYWRkZWQgZXh5bm9zIGNoYW5nZV0K PiBTaWduZWQtb2ZmLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KPiBTaWdu ZWQtb2ZmLWJ5OiBUaGllcnJ5IEVzY2FuZGUgPHRoaWVycnkuZXNjYW5kZUBjb2xsYWJvcmEuY29t Pgo+IFJldmlld2VkLWJ5OiBBbmRyemVqIEhhamRhIDxhLmhhamRhQHNhbXN1bmcuY29tPgo+IFNp Z25lZC1vZmYtYnk6IEVucmljIEJhbGxldGJvIGkgU2VycmEgPGVucmljLmJhbGxldGJvQGNvbGxh Ym9yYS5jb20+Cj4gVGVzdGVkLWJ5OiBNYXJlayBTenlwcm93c2tpIDxtLnN6eXByb3dza2lAc2Ft c3VuZy5jb20+Cj4gUmV2aWV3ZWQtYnk6IEFyY2hpdCBUYW5lamEgPGFyY2hpdHRAY29kZWF1cm9y YS5vcmc+CgpBY2tlZC1ieTogSmluZ29vIEhhbiA8amluZ29vaGFuMUBnbWFpbC5jb20+CgpCZXN0 IHJlZ2FyZHMsCkppbmdvbyBIYW4KCj4gLS0tCj4gCj4gIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2Uv YW5hbG9naXgvYW5hbG9naXhfZHBfY29yZS5jIHwgIDcgKysrKystLQo+ICBkcml2ZXJzL2dwdS9k cm0vZXh5bm9zL2V4eW5vc19kcC5jICAgICAgICAgICAgICAgICB8ICAyICstCj4gIGRyaXZlcnMv Z3B1L2RybS9yb2NrY2hpcC9hbmFsb2dpeF9kcC1yb2NrY2hpcC5jICAgIHwgMTIgKysrKysrKysr Ky0tCj4gIGluY2x1ZGUvZHJtL2JyaWRnZS9hbmFsb2dpeF9kcC5oICAgICAgICAgICAgICAgICAg IHwgIDMgKystCj4gIDQgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9hbmFsb2dpeC9h bmFsb2dpeF9kcF9jb3JlLmMKPiBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvYW5hbG9naXgvYW5h bG9naXhfZHBfY29yZS5jCj4gaW5kZXggYTI2MGRlNGYwYmQ4Li4yYmNiZmFkYjZhYzUgMTAwNjQ0 Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9hbmFsb2dpeC9hbmFsb2dpeF9kcF9jb3Jl LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2FuYWxvZ2l4L2FuYWxvZ2l4X2RwX2Nv cmUuYwo+IEBAIC0xMjYwLDggKzEyNjAsOCBAQCBzdGF0aWMgaW50IGFuYWxvZ2l4X2RwX3NldF9i cmlkZ2Uoc3RydWN0Cj4gYW5hbG9naXhfZHBfZGV2aWNlICpkcCkKPiAgCQlnb3RvIG91dF9kcF9j bGtfcHJlOwo+ICAJfQo+IAo+IC0JaWYgKGRwLT5wbGF0X2RhdGEtPnBvd2VyX29uKQo+IC0JCWRw LT5wbGF0X2RhdGEtPnBvd2VyX29uKGRwLT5wbGF0X2RhdGEpOwo+ICsJaWYgKGRwLT5wbGF0X2Rh dGEtPnBvd2VyX29uX3N0YXJ0KQo+ICsJCWRwLT5wbGF0X2RhdGEtPnBvd2VyX29uX3N0YXJ0KGRw LT5wbGF0X2RhdGEpOwo+IAo+ICAJcGh5X3Bvd2VyX29uKGRwLT5waHkpOwo+IAo+IEBAIC0xMjg2 LDYgKzEyODYsOSBAQCBzdGF0aWMgaW50IGFuYWxvZ2l4X2RwX3NldF9icmlkZ2Uoc3RydWN0Cj4g YW5hbG9naXhfZHBfZGV2aWNlICpkcCkKPiAgCQlnb3RvIG91dF9kcF9pbml0Owo+ICAJfQo+IAo+ ICsJaWYgKGRwLT5wbGF0X2RhdGEtPnBvd2VyX29uX2VuZCkKPiArCQlkcC0+cGxhdF9kYXRhLT5w b3dlcl9vbl9lbmQoZHAtPnBsYXRfZGF0YSk7Cj4gKwo+ICAJZW5hYmxlX2lycShkcC0+aXJxKTsK PiAgCXJldHVybiAwOwo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4 eW5vc19kcC5jCj4gYi9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcC5jCj4gaW5kZXgg OTY0ODMxZGFiMTAyLi44NjMzMGYzOTY3ODQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L2V4eW5vcy9leHlub3NfZHAuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9leHlub3MvZXh5bm9z X2RwLmMKPiBAQCAtMTYyLDcgKzE2Miw3IEBAIHN0YXRpYyBpbnQgZXh5bm9zX2RwX2JpbmQoc3Ry dWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QKPiBkZXZpY2UgKm1hc3Rlciwgdm9pZCAqZGF0YSkKPiAg CWRwLT5kcm1fZGV2ID0gZHJtX2RldjsKPiAKPiAgCWRwLT5wbGF0X2RhdGEuZGV2X3R5cGUgPSBF WFlOT1NfRFA7Cj4gLQlkcC0+cGxhdF9kYXRhLnBvd2VyX29uID0gZXh5bm9zX2RwX3Bvd2Vyb247 Cj4gKwlkcC0+cGxhdF9kYXRhLnBvd2VyX29uX3N0YXJ0ID0gZXh5bm9zX2RwX3Bvd2Vyb247Cj4g IAlkcC0+cGxhdF9kYXRhLnBvd2VyX29mZiA9IGV4eW5vc19kcF9wb3dlcm9mZjsKPiAgCWRwLT5w bGF0X2RhdGEuYXR0YWNoID0gZXh5bm9zX2RwX2JyaWRnZV9hdHRhY2g7Cj4gIAlkcC0+cGxhdF9k YXRhLmdldF9tb2RlcyA9IGV4eW5vc19kcF9nZXRfbW9kZXM7Cj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9hbmFsb2dpeF9kcC1yb2NrY2hpcC5jCj4gYi9kcml2ZXJzL2dw dS9kcm0vcm9ja2NoaXAvYW5hbG9naXhfZHAtcm9ja2NoaXAuYwo+IGluZGV4IGIzZjQ2ZWQyNGNk Yy4uMjMzMTdhMjI2OWUxIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9h bmFsb2dpeF9kcC1yb2NrY2hpcC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2Fu YWxvZ2l4X2RwLXJvY2tjaGlwLmMKPiBAQCAtMTA5LDcgKzEwOSw3IEBAIHN0YXRpYyBpbnQgcm9j a2NoaXBfZHBfcHJlX2luaXQoc3RydWN0Cj4gcm9ja2NoaXBfZHBfZGV2aWNlICpkcCkKPiAgCXJl dHVybiAwOwo+ICB9Cj4gCj4gLXN0YXRpYyBpbnQgcm9ja2NoaXBfZHBfcG93ZXJvbihzdHJ1Y3Qg YW5hbG9naXhfZHBfcGxhdF9kYXRhICpwbGF0X2RhdGEpCj4gK3N0YXRpYyBpbnQgcm9ja2NoaXBf ZHBfcG93ZXJvbl9zdGFydChzdHJ1Y3QgYW5hbG9naXhfZHBfcGxhdF9kYXRhCj4gKnBsYXRfZGF0 YSkKPiAgewo+ICAJc3RydWN0IHJvY2tjaGlwX2RwX2RldmljZSAqZHAgPSB0b19kcChwbGF0X2Rh dGEpOwo+ICAJaW50IHJldDsKPiBAQCAtMTI3LDYgKzEyNywxMyBAQCBzdGF0aWMgaW50IHJvY2tj aGlwX2RwX3Bvd2Vyb24oc3RydWN0Cj4gYW5hbG9naXhfZHBfcGxhdF9kYXRhICpwbGF0X2RhdGEp Cj4gIAkJcmV0dXJuIHJldDsKPiAgCX0KPiAKPiArCXJldHVybiByZXQ7Cj4gK30KPiArCj4gK3N0 YXRpYyBpbnQgcm9ja2NoaXBfZHBfcG93ZXJvbl9lbmQoc3RydWN0IGFuYWxvZ2l4X2RwX3BsYXRf ZGF0YQo+ICpwbGF0X2RhdGEpCj4gK3sKPiArCXN0cnVjdCByb2NrY2hpcF9kcF9kZXZpY2UgKmRw ID0gdG9fZHAocGxhdF9kYXRhKTsKPiArCj4gIAlyZXR1cm4gcm9ja2NoaXBfZHJtX3Bzcl9hY3Rp dmF0ZSgmZHAtPmVuY29kZXIpOwo+ICB9Cj4gCj4gQEAgLTMzMCw3ICszMzcsOCBAQCBzdGF0aWMg aW50IHJvY2tjaGlwX2RwX2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QKPiBkZXZpY2Ug Km1hc3RlciwKPiAgCWRwLT5wbGF0X2RhdGEuZW5jb2RlciA9ICZkcC0+ZW5jb2RlcjsKPiAKPiAg CWRwLT5wbGF0X2RhdGEuZGV2X3R5cGUgPSBkcC0+ZGF0YS0+Y2hpcF90eXBlOwo+IC0JZHAtPnBs YXRfZGF0YS5wb3dlcl9vbiA9IHJvY2tjaGlwX2RwX3Bvd2Vyb247Cj4gKwlkcC0+cGxhdF9kYXRh LnBvd2VyX29uX3N0YXJ0ID0gcm9ja2NoaXBfZHBfcG93ZXJvbl9zdGFydDsKPiArCWRwLT5wbGF0 X2RhdGEucG93ZXJfb25fZW5kID0gcm9ja2NoaXBfZHBfcG93ZXJvbl9lbmQ7Cj4gIAlkcC0+cGxh dF9kYXRhLnBvd2VyX29mZiA9IHJvY2tjaGlwX2RwX3Bvd2VyZG93bjsKPiAgCWRwLT5wbGF0X2Rh dGEuZ2V0X21vZGVzID0gcm9ja2NoaXBfZHBfZ2V0X21vZGVzOwo+IAo+IGRpZmYgLS1naXQgYS9p bmNsdWRlL2RybS9icmlkZ2UvYW5hbG9naXhfZHAuaAo+IGIvaW5jbHVkZS9kcm0vYnJpZGdlL2Fu YWxvZ2l4X2RwLmgKPiBpbmRleCBlOWExMTE2ZDJmOGUuLjQ3NWI3MDZiNDlkZSAxMDA2NDQKPiAt LS0gYS9pbmNsdWRlL2RybS9icmlkZ2UvYW5hbG9naXhfZHAuaAo+ICsrKyBiL2luY2x1ZGUvZHJt L2JyaWRnZS9hbmFsb2dpeF9kcC5oCj4gQEAgLTMzLDcgKzMzLDggQEAgc3RydWN0IGFuYWxvZ2l4 X2RwX3BsYXRfZGF0YSB7Cj4gIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwo+ICAJ Ym9vbCBza2lwX2Nvbm5lY3RvcjsKPiAKPiAtCWludCAoKnBvd2VyX29uKShzdHJ1Y3QgYW5hbG9n aXhfZHBfcGxhdF9kYXRhICopOwo+ICsJaW50ICgqcG93ZXJfb25fc3RhcnQpKHN0cnVjdCBhbmFs b2dpeF9kcF9wbGF0X2RhdGEgKik7Cj4gKwlpbnQgKCpwb3dlcl9vbl9lbmQpKHN0cnVjdCBhbmFs b2dpeF9kcF9wbGF0X2RhdGEgKik7Cj4gIAlpbnQgKCpwb3dlcl9vZmYpKHN0cnVjdCBhbmFsb2dp eF9kcF9wbGF0X2RhdGEgKik7Cj4gIAlpbnQgKCphdHRhY2gpKHN0cnVjdCBhbmFsb2dpeF9kcF9w bGF0X2RhdGEgKiwgc3RydWN0IGRybV9icmlkZ2UgKiwKPiAgCQkgICAgICBzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqKTsKPiAtLQo+IDIuMTcuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: jingoohan1@gmail.com (Jingoo Han) Date: Tue, 24 Apr 2018 10:02:33 -0400 Subject: [RESEND PATCH v6 22/27] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts In-Reply-To: <20180423105003.9004-23-enric.balletbo@collabora.com> References: <20180423105003.9004-1-enric.balletbo@collabora.com> <20180423105003.9004-23-enric.balletbo@collabora.com> Message-ID: <000501d3dbd4$e6f238e0$b4d6aaa0$@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Monday, April 23, 2018 6:50 AM, Enric Balletbo i Serra wrote: > > 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 > Signed-off-by: Thierry Escande > Reviewed-by: Andrzej Hajda > Signed-off-by: Enric Balletbo i Serra > Tested-by: Marek Szyprowski > Reviewed-by: Archit Taneja Acked-by: Jingoo Han Best regards, Jingoo Han > --- > > 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 a260de4f0bd8..2bcbfadb6ac5 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > @@ -1260,8 +1260,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); > > @@ -1286,6 +1286,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 964831dab102..86330f396784 100644 > --- a/drivers/gpu/drm/exynos/exynos_dp.c > +++ b/drivers/gpu/drm/exynos/exynos_dp.c > @@ -162,7 +162,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 b3f46ed24cdc..23317a2269e1 100644 > --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > @@ -109,7 +109,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; > @@ -127,6 +127,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); > } > > @@ -330,7 +337,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; > > diff --git a/include/drm/bridge/analogix_dp.h > b/include/drm/bridge/analogix_dp.h > index e9a1116d2f8e..475b706b49de 100644 > --- a/include/drm/bridge/analogix_dp.h > +++ b/include/drm/bridge/analogix_dp.h > @@ -33,7 +33,8 @@ struct analogix_dp_plat_data { > struct drm_connector *connector; > bool skip_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 *); > -- > 2.17.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758396AbeDXOCm (ORCPT ); Tue, 24 Apr 2018 10:02:42 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:33432 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758159AbeDXOCk (ORCPT ); Tue, 24 Apr 2018 10:02:40 -0400 X-Google-Smtp-Source: AB8JxZrerpR4gw7iBLpulDl0q9g/ThEXVNStYS+KuS17PDrAhw9KIZlBeuf+rjPQBgkMMhONUgdz0A== From: "Jingoo Han" To: "'Enric Balletbo i Serra'" , , , , , , , , Cc: , , , , , , , , , , , , , , , , , , , , , , , "'Kristian H . Kristensen'" References: <20180423105003.9004-1-enric.balletbo@collabora.com> <20180423105003.9004-23-enric.balletbo@collabora.com> In-Reply-To: <20180423105003.9004-23-enric.balletbo@collabora.com> Subject: Re: [RESEND PATCH v6 22/27] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts Date: Tue, 24 Apr 2018 10:02:33 -0400 Message-ID: <000501d3dbd4$e6f238e0$b4d6aaa0$@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 16.0 Content-Language: en-us Thread-Index: AQJsKqzGdLQ3B8H319FIYPcigFOt/AEu9dt2otXchSA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Monday, April 23, 2018 6:50 AM, Enric Balletbo i Serra wrote: > > 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 > Signed-off-by: Thierry Escande > Reviewed-by: Andrzej Hajda > Signed-off-by: Enric Balletbo i Serra > Tested-by: Marek Szyprowski > Reviewed-by: Archit Taneja Acked-by: Jingoo Han Best regards, Jingoo Han > --- > > 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 a260de4f0bd8..2bcbfadb6ac5 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > @@ -1260,8 +1260,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); > > @@ -1286,6 +1286,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 964831dab102..86330f396784 100644 > --- a/drivers/gpu/drm/exynos/exynos_dp.c > +++ b/drivers/gpu/drm/exynos/exynos_dp.c > @@ -162,7 +162,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 b3f46ed24cdc..23317a2269e1 100644 > --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > @@ -109,7 +109,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; > @@ -127,6 +127,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); > } > > @@ -330,7 +337,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; > > diff --git a/include/drm/bridge/analogix_dp.h > b/include/drm/bridge/analogix_dp.h > index e9a1116d2f8e..475b706b49de 100644 > --- a/include/drm/bridge/analogix_dp.h > +++ b/include/drm/bridge/analogix_dp.h > @@ -33,7 +33,8 @@ struct analogix_dp_plat_data { > struct drm_connector *connector; > bool skip_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 *); > -- > 2.17.0