From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751636AbdJSDsv (ORCPT ); Wed, 18 Oct 2017 23:48:51 -0400 Received: from regular1.263xmail.com ([211.150.99.139]:47600 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751576AbdJSDst (ORCPT ); Wed, 18 Oct 2017 23:48:49 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: <17d8a56af916984afe9d32f9d77d33e8> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Jeffy Chen To: linux-kernel@vger.kernel.org Cc: briannorris@chromium.org, seanpaul@chromium.org, dianders@chromium.org, heiko@sntech.de, tfiga@chromium.org, Jeffy Chen , Mark Yao , dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, David Airlie , linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 02/10] drm/rockchip: analogix_dp: Remove unnecessary init code Date: Thu, 19 Oct 2017 11:48:04 +0800 Message-Id: <20171019034812.13768-3-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171019034812.13768-1-jeffy.chen@rock-chips.com> References: <20171019034812.13768-1-jeffy.chen@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove unnecessary init code, since we would do it in the power_on() callback. Also move of parse code to probe(). Fixes: 9e32e16e9e98 ("drm: rockchip: dp: add rockchip platform dp driver") Signed-off-by: Jeffy Chen --- Changes in v6: None Changes in v5: None drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 27 ++++++------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index 4d3f6ad0abdd..8cae5ad926cd 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -269,7 +269,7 @@ static struct drm_encoder_funcs rockchip_dp_encoder_funcs = { .destroy = rockchip_dp_drm_encoder_destroy, }; -static int rockchip_dp_init(struct rockchip_dp_device *dp) +static int rockchip_dp_of_probe(struct rockchip_dp_device *dp) { struct device *dev = dp->dev; struct device_node *np = dev->of_node; @@ -303,19 +303,6 @@ static int rockchip_dp_init(struct rockchip_dp_device *dp) return PTR_ERR(dp->rst); } - ret = clk_prepare_enable(dp->pclk); - if (ret < 0) { - DRM_DEV_ERROR(dp->dev, "failed to enable pclk %d\n", ret); - return ret; - } - - ret = rockchip_dp_pre_init(dp); - if (ret < 0) { - DRM_DEV_ERROR(dp->dev, "failed to pre init %d\n", ret); - clk_disable_unprepare(dp->pclk); - return ret; - } - return 0; } @@ -361,10 +348,6 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, if (!dp_data) return -ENODEV; - ret = rockchip_dp_init(dp); - if (ret < 0) - return ret; - dp->data = dp_data; dp->drm_dev = drm_dev; @@ -398,7 +381,6 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master, rockchip_drm_psr_unregister(&dp->encoder); analogix_dp_unbind(dev, master, data); - clk_disable_unprepare(dp->pclk); } static const struct component_ops rockchip_dp_component_ops = { @@ -414,7 +396,7 @@ static int rockchip_dp_probe(struct platform_device *pdev) int ret; ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &panel, NULL); - if (ret) + if (ret < 0) return ret; dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); @@ -422,9 +404,12 @@ static int rockchip_dp_probe(struct platform_device *pdev) return -ENOMEM; dp->dev = dev; - dp->plat_data.panel = panel; + ret = rockchip_dp_of_probe(dp); + if (ret < 0) + return ret; + /* * We just use the drvdata until driver run into component * add function, and then we would set drvdata to null, so -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeffy Chen Subject: [PATCH v6 02/10] drm/rockchip: analogix_dp: Remove unnecessary init code Date: Thu, 19 Oct 2017 11:48:04 +0800 Message-ID: <20171019034812.13768-3-jeffy.chen@rock-chips.com> References: <20171019034812.13768-1-jeffy.chen@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171019034812.13768-1-jeffy.chen@rock-chips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org Cc: briannorris@chromium.org, Jeffy Chen , dianders@chromium.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org UmVtb3ZlIHVubmVjZXNzYXJ5IGluaXQgY29kZSwgc2luY2Ugd2Ugd291bGQgZG8gaXQgaW4gdGhl IHBvd2VyX29uKCkKY2FsbGJhY2suCgpBbHNvIG1vdmUgb2YgcGFyc2UgY29kZSB0byBwcm9iZSgp LgoKRml4ZXM6IDllMzJlMTZlOWU5OCAoImRybTogcm9ja2NoaXA6IGRwOiBhZGQgcm9ja2NoaXAg cGxhdGZvcm0gZHAgZHJpdmVyIikKU2lnbmVkLW9mZi1ieTogSmVmZnkgQ2hlbiA8amVmZnkuY2hl bkByb2NrLWNoaXBzLmNvbT4KLS0tCgpDaGFuZ2VzIGluIHY2OiBOb25lCkNoYW5nZXMgaW4gdjU6 IE5vbmUKCiBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvYW5hbG9naXhfZHAtcm9ja2NoaXAuYyB8 IDI3ICsrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlv bnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2Nr Y2hpcC9hbmFsb2dpeF9kcC1yb2NrY2hpcC5jIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2Fu YWxvZ2l4X2RwLXJvY2tjaGlwLmMKaW5kZXggNGQzZjZhZDBhYmRkLi44Y2FlNWFkOTI2Y2QgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9hbmFsb2dpeF9kcC1yb2NrY2hpcC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9hbmFsb2dpeF9kcC1yb2NrY2hpcC5jCkBA IC0yNjksNyArMjY5LDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fZW5jb2Rlcl9mdW5jcyByb2NrY2hp cF9kcF9lbmNvZGVyX2Z1bmNzID0gewogCS5kZXN0cm95ID0gcm9ja2NoaXBfZHBfZHJtX2VuY29k ZXJfZGVzdHJveSwKIH07CiAKLXN0YXRpYyBpbnQgcm9ja2NoaXBfZHBfaW5pdChzdHJ1Y3Qgcm9j a2NoaXBfZHBfZGV2aWNlICpkcCkKK3N0YXRpYyBpbnQgcm9ja2NoaXBfZHBfb2ZfcHJvYmUoc3Ry dWN0IHJvY2tjaGlwX2RwX2RldmljZSAqZHApCiB7CiAJc3RydWN0IGRldmljZSAqZGV2ID0gZHAt PmRldjsKIAlzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wID0gZGV2LT5vZl9ub2RlOwpAQCAtMzAzLDE5 ICszMDMsNiBAQCBzdGF0aWMgaW50IHJvY2tjaGlwX2RwX2luaXQoc3RydWN0IHJvY2tjaGlwX2Rw X2RldmljZSAqZHApCiAJCXJldHVybiBQVFJfRVJSKGRwLT5yc3QpOwogCX0KIAotCXJldCA9IGNs a19wcmVwYXJlX2VuYWJsZShkcC0+cGNsayk7Ci0JaWYgKHJldCA8IDApIHsKLQkJRFJNX0RFVl9F UlJPUihkcC0+ZGV2LCAiZmFpbGVkIHRvIGVuYWJsZSBwY2xrICVkXG4iLCByZXQpOwotCQlyZXR1 cm4gcmV0OwotCX0KLQotCXJldCA9IHJvY2tjaGlwX2RwX3ByZV9pbml0KGRwKTsKLQlpZiAocmV0 IDwgMCkgewotCQlEUk1fREVWX0VSUk9SKGRwLT5kZXYsICJmYWlsZWQgdG8gcHJlIGluaXQgJWRc biIsIHJldCk7Ci0JCWNsa19kaXNhYmxlX3VucHJlcGFyZShkcC0+cGNsayk7Ci0JCXJldHVybiBy ZXQ7Ci0JfQotCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTM2MSwxMCArMzQ4LDYgQEAgc3RhdGljIGlu dCByb2NrY2hpcF9kcF9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZSAqbWFz dGVyLAogCWlmICghZHBfZGF0YSkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKLQlyZXQgPSByb2NrY2hp cF9kcF9pbml0KGRwKTsKLQlpZiAocmV0IDwgMCkKLQkJcmV0dXJuIHJldDsKLQogCWRwLT5kYXRh ID0gZHBfZGF0YTsKIAlkcC0+ZHJtX2RldiA9IGRybV9kZXY7CiAKQEAgLTM5OCw3ICszODEsNiBA QCBzdGF0aWMgdm9pZCByb2NrY2hpcF9kcF91bmJpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1 Y3QgZGV2aWNlICptYXN0ZXIsCiAJcm9ja2NoaXBfZHJtX3Bzcl91bnJlZ2lzdGVyKCZkcC0+ZW5j b2Rlcik7CiAKIAlhbmFsb2dpeF9kcF91bmJpbmQoZGV2LCBtYXN0ZXIsIGRhdGEpOwotCWNsa19k aXNhYmxlX3VucHJlcGFyZShkcC0+cGNsayk7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgY29t cG9uZW50X29wcyByb2NrY2hpcF9kcF9jb21wb25lbnRfb3BzID0gewpAQCAtNDE0LDcgKzM5Niw3 IEBAIHN0YXRpYyBpbnQgcm9ja2NoaXBfZHBfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAq cGRldikKIAlpbnQgcmV0OwogCiAJcmV0ID0gZHJtX29mX2ZpbmRfcGFuZWxfb3JfYnJpZGdlKGRl di0+b2Zfbm9kZSwgMSwgMCwgJnBhbmVsLCBOVUxMKTsKLQlpZiAocmV0KQorCWlmIChyZXQgPCAw KQogCQlyZXR1cm4gcmV0OwogCiAJZHAgPSBkZXZtX2t6YWxsb2MoZGV2LCBzaXplb2YoKmRwKSwg R0ZQX0tFUk5FTCk7CkBAIC00MjIsOSArNDA0LDEyIEBAIHN0YXRpYyBpbnQgcm9ja2NoaXBfZHBf cHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkJcmV0dXJuIC1FTk9NRU07CiAK IAlkcC0+ZGV2ID0gZGV2OwotCiAJZHAtPnBsYXRfZGF0YS5wYW5lbCA9IHBhbmVsOwogCisJcmV0 ID0gcm9ja2NoaXBfZHBfb2ZfcHJvYmUoZHApOworCWlmIChyZXQgPCAwKQorCQlyZXR1cm4gcmV0 OworCiAJLyoKIAkgKiBXZSBqdXN0IHVzZSB0aGUgZHJ2ZGF0YSB1bnRpbCBkcml2ZXIgcnVuIGlu dG8gY29tcG9uZW50CiAJICogYWRkIGZ1bmN0aW9uLCBhbmQgdGhlbiB3ZSB3b3VsZCBzZXQgZHJ2 ZGF0YSB0byBudWxsLCBzbwotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: jeffy.chen@rock-chips.com (Jeffy Chen) Date: Thu, 19 Oct 2017 11:48:04 +0800 Subject: [PATCH v6 02/10] drm/rockchip: analogix_dp: Remove unnecessary init code In-Reply-To: <20171019034812.13768-1-jeffy.chen@rock-chips.com> References: <20171019034812.13768-1-jeffy.chen@rock-chips.com> Message-ID: <20171019034812.13768-3-jeffy.chen@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Remove unnecessary init code, since we would do it in the power_on() callback. Also move of parse code to probe(). Fixes: 9e32e16e9e98 ("drm: rockchip: dp: add rockchip platform dp driver") Signed-off-by: Jeffy Chen --- Changes in v6: None Changes in v5: None drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 27 ++++++------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index 4d3f6ad0abdd..8cae5ad926cd 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -269,7 +269,7 @@ static struct drm_encoder_funcs rockchip_dp_encoder_funcs = { .destroy = rockchip_dp_drm_encoder_destroy, }; -static int rockchip_dp_init(struct rockchip_dp_device *dp) +static int rockchip_dp_of_probe(struct rockchip_dp_device *dp) { struct device *dev = dp->dev; struct device_node *np = dev->of_node; @@ -303,19 +303,6 @@ static int rockchip_dp_init(struct rockchip_dp_device *dp) return PTR_ERR(dp->rst); } - ret = clk_prepare_enable(dp->pclk); - if (ret < 0) { - DRM_DEV_ERROR(dp->dev, "failed to enable pclk %d\n", ret); - return ret; - } - - ret = rockchip_dp_pre_init(dp); - if (ret < 0) { - DRM_DEV_ERROR(dp->dev, "failed to pre init %d\n", ret); - clk_disable_unprepare(dp->pclk); - return ret; - } - return 0; } @@ -361,10 +348,6 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, if (!dp_data) return -ENODEV; - ret = rockchip_dp_init(dp); - if (ret < 0) - return ret; - dp->data = dp_data; dp->drm_dev = drm_dev; @@ -398,7 +381,6 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master, rockchip_drm_psr_unregister(&dp->encoder); analogix_dp_unbind(dev, master, data); - clk_disable_unprepare(dp->pclk); } static const struct component_ops rockchip_dp_component_ops = { @@ -414,7 +396,7 @@ static int rockchip_dp_probe(struct platform_device *pdev) int ret; ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &panel, NULL); - if (ret) + if (ret < 0) return ret; dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); @@ -422,9 +404,12 @@ static int rockchip_dp_probe(struct platform_device *pdev) return -ENOMEM; dp->dev = dev; - dp->plat_data.panel = panel; + ret = rockchip_dp_of_probe(dp); + if (ret < 0) + return ret; + /* * We just use the drvdata until driver run into component * add function, and then we would set drvdata to null, so -- 2.11.0