From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754389AbcGHJGZ (ORCPT ); Fri, 8 Jul 2016 05:06:25 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34091 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754288AbcGHJFt (ORCPT ); Fri, 8 Jul 2016 05:05:49 -0400 From: Chris Zhong To: dianders@chromium.org, tfiga@chromium.org, heiko@sntech.de, yzq@rock-chips.com Cc: linux-rockchip@lists.infradead.org, Chris Zhong , Mark Yao , David Airlie , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] drm/rockchip: dw-mipi: support HPD poll Date: Fri, 8 Jul 2016 17:04:59 +0800 Message-Id: <1467968701-15620-6-git-send-email-zyw@rock-chips.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1467968701-15620-1-git-send-email-zyw@rock-chips.com> References: <1467968701-15620-1-git-send-email-zyw@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At the first time of bind, there is no any panel attach in mipi. Add a DRM_CONNECTOR_POLL_HPD porperty to detect the panel status, when panel probe, the dw_mipi_dsi_host_attach would be called, then mipi-dsi will trigger a event to notify the drm framework. Signed-off-by: Chris Zhong --- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 41 ++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index 15ba796..72d7f48 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -285,6 +285,7 @@ struct dw_mipi_dsi { struct drm_encoder encoder; struct drm_connector connector; struct mipi_dsi_host dsi_host; + struct device_node *panel_node; struct drm_panel *panel; struct device *dev; struct regmap *grf_regmap; @@ -462,7 +463,6 @@ static int dw_mipi_dsi_phy_init(struct dw_mipi_dsi *dsi) dsi_write(dsi, DSI_PHY_RSTZ, PHY_ENFORCEPLL | PHY_ENABLECLK | PHY_UNRSTZ | PHY_UNSHUTDOWNZ); - ret = readx_poll_timeout(readl, dsi->base + DSI_PHY_STATUS, val, val & LOCK, 1000, PHY_STATUS_TIMEOUT_US); if (ret < 0) { @@ -550,11 +550,11 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, dsi->lanes = device->lanes; dsi->channel = device->channel; dsi->format = device->format; - dsi->panel = of_drm_find_panel(device->dev.of_node); - if (dsi->panel) - return drm_panel_attach(dsi->panel, &dsi->connector); + dsi->panel_node = device->dev.of_node; + if (dsi->connector.dev) + drm_helper_hpd_irq_event(dsi->connector.dev); - return -EINVAL; + return 0; } static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host, @@ -562,7 +562,10 @@ static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host, { struct dw_mipi_dsi *dsi = host_to_dsi(host); - drm_panel_detach(dsi->panel); + dsi->panel_node = NULL; + + if (dsi->connector.dev) + drm_helper_hpd_irq_event(dsi->connector.dev); return 0; } @@ -1022,13 +1025,33 @@ static struct drm_connector_helper_funcs dw_mipi_dsi_connector_helper_funcs = { static enum drm_connector_status dw_mipi_dsi_detect(struct drm_connector *connector, bool force) { - return connector_status_connected; + struct dw_mipi_dsi *dsi = con_to_dsi(connector); + + + if (!dsi->panel) { + dsi->panel = of_drm_find_panel(dsi->panel_node); + if (dsi->panel) + drm_panel_attach(dsi->panel, &dsi->connector); + } else if (!dsi->panel_node) { + struct drm_encoder *encoder; + + encoder = platform_get_drvdata(to_platform_device(dsi->dev)); + dw_mipi_dsi_encoder_disable(encoder); + drm_panel_detach(dsi->panel); + dsi->panel = NULL; + } + + if (dsi->panel) + return connector_status_connected; + + return connector_status_disconnected; } static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector) { drm_connector_unregister(connector); drm_connector_cleanup(connector); + connector->dev = NULL; } static struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = { @@ -1069,6 +1092,8 @@ static int dw_mipi_dsi_register(struct drm_device *drm, return ret; } + connector->polled = DRM_CONNECTOR_POLL_HPD; + drm_connector_helper_add(connector, &dw_mipi_dsi_connector_helper_funcs); @@ -1225,6 +1250,8 @@ static void dw_mipi_dsi_unbind(struct device *dev, struct device *master, { struct dw_mipi_dsi *dsi = dev_get_drvdata(dev); + dw_mipi_dsi_encoder_disable(&dsi->encoder); + mipi_dsi_host_unregister(&dsi->dsi_host); pm_runtime_disable(dev); clk_disable_unprepare(dsi->pllref_clk); -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Zhong Subject: [PATCH 5/7] drm/rockchip: dw-mipi: support HPD poll Date: Fri, 8 Jul 2016 17:04:59 +0800 Message-ID: <1467968701-15620-6-git-send-email-zyw@rock-chips.com> References: <1467968701-15620-1-git-send-email-zyw@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1467968701-15620-1-git-send-email-zyw@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: dianders@chromium.org, tfiga@chromium.org, heiko@sntech.de, yzq@rock-chips.com Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Chris Zhong , linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org QXQgdGhlIGZpcnN0IHRpbWUgb2YgYmluZCwgdGhlcmUgaXMgbm8gYW55IHBhbmVsIGF0dGFjaCBp biBtaXBpLiBBZGQgYQpEUk1fQ09OTkVDVE9SX1BPTExfSFBEIHBvcnBlcnR5IHRvIGRldGVjdCB0 aGUgcGFuZWwgc3RhdHVzLCB3aGVuIHBhbmVsCnByb2JlLCB0aGUgZHdfbWlwaV9kc2lfaG9zdF9h dHRhY2ggd291bGQgYmUgY2FsbGVkLCB0aGVuIG1pcGktZHNpIHdpbGwKdHJpZ2dlciBhIGV2ZW50 IHRvIG5vdGlmeSB0aGUgZHJtIGZyYW1ld29yay4KClNpZ25lZC1vZmYtYnk6IENocmlzIFpob25n IDx6eXdAcm9jay1jaGlwcy5jb20+Ci0tLQoKIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1t aXBpLWRzaS5jIHwgNDEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvZHctbWlwaS1kc2kuYwppbmRleCAxNWJhNzk2Li43MmQ3ZjQ4IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYwpAQCAtMjg1LDYgKzI4NSw3IEBAIHN0cnVjdCBk d19taXBpX2RzaSB7CiAJc3RydWN0IGRybV9lbmNvZGVyIGVuY29kZXI7CiAJc3RydWN0IGRybV9j b25uZWN0b3IgY29ubmVjdG9yOwogCXN0cnVjdCBtaXBpX2RzaV9ob3N0IGRzaV9ob3N0OworCXN0 cnVjdCBkZXZpY2Vfbm9kZSAqcGFuZWxfbm9kZTsKIAlzdHJ1Y3QgZHJtX3BhbmVsICpwYW5lbDsK IAlzdHJ1Y3QgZGV2aWNlICpkZXY7CiAJc3RydWN0IHJlZ21hcCAqZ3JmX3JlZ21hcDsKQEAgLTQ2 Miw3ICs0NjMsNiBAQCBzdGF0aWMgaW50IGR3X21pcGlfZHNpX3BoeV9pbml0KHN0cnVjdCBkd19t aXBpX2RzaSAqZHNpKQogCWRzaV93cml0ZShkc2ksIERTSV9QSFlfUlNUWiwgUEhZX0VORk9SQ0VQ TEwgfCBQSFlfRU5BQkxFQ0xLIHwKIAkJCQkgICAgIFBIWV9VTlJTVFogfCBQSFlfVU5TSFVURE9X TlopOwogCi0KIAlyZXQgPSByZWFkeF9wb2xsX3RpbWVvdXQocmVhZGwsIGRzaS0+YmFzZSArIERT SV9QSFlfU1RBVFVTLAogCQkJCSB2YWwsIHZhbCAmIExPQ0ssIDEwMDAsIFBIWV9TVEFUVVNfVElN RU9VVF9VUyk7CiAJaWYgKHJldCA8IDApIHsKQEAgLTU1MCwxMSArNTUwLDExIEBAIHN0YXRpYyBp bnQgZHdfbWlwaV9kc2lfaG9zdF9hdHRhY2goc3RydWN0IG1pcGlfZHNpX2hvc3QgKmhvc3QsCiAJ ZHNpLT5sYW5lcyA9IGRldmljZS0+bGFuZXM7CiAJZHNpLT5jaGFubmVsID0gZGV2aWNlLT5jaGFu bmVsOwogCWRzaS0+Zm9ybWF0ID0gZGV2aWNlLT5mb3JtYXQ7Ci0JZHNpLT5wYW5lbCA9IG9mX2Ry bV9maW5kX3BhbmVsKGRldmljZS0+ZGV2Lm9mX25vZGUpOwotCWlmIChkc2ktPnBhbmVsKQotCQly ZXR1cm4gZHJtX3BhbmVsX2F0dGFjaChkc2ktPnBhbmVsLCAmZHNpLT5jb25uZWN0b3IpOworCWRz aS0+cGFuZWxfbm9kZSA9IGRldmljZS0+ZGV2Lm9mX25vZGU7CisJaWYgKGRzaS0+Y29ubmVjdG9y LmRldikKKwkJZHJtX2hlbHBlcl9ocGRfaXJxX2V2ZW50KGRzaS0+Y29ubmVjdG9yLmRldik7CiAK LQlyZXR1cm4gLUVJTlZBTDsKKwlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludCBkd19taXBpX2Rz aV9ob3N0X2RldGFjaChzdHJ1Y3QgbWlwaV9kc2lfaG9zdCAqaG9zdCwKQEAgLTU2Miw3ICs1NjIs MTAgQEAgc3RhdGljIGludCBkd19taXBpX2RzaV9ob3N0X2RldGFjaChzdHJ1Y3QgbWlwaV9kc2lf aG9zdCAqaG9zdCwKIHsKIAlzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSA9IGhvc3RfdG9fZHNpKGhv c3QpOwogCi0JZHJtX3BhbmVsX2RldGFjaChkc2ktPnBhbmVsKTsKKwlkc2ktPnBhbmVsX25vZGUg PSBOVUxMOworCisJaWYgKGRzaS0+Y29ubmVjdG9yLmRldikKKwkJZHJtX2hlbHBlcl9ocGRfaXJx X2V2ZW50KGRzaS0+Y29ubmVjdG9yLmRldik7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTEwMjIsMTMg KzEwMjUsMzMgQEAgc3RhdGljIHN0cnVjdCBkcm1fY29ubmVjdG9yX2hlbHBlcl9mdW5jcyBkd19t aXBpX2RzaV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzID0gewogc3RhdGljIGVudW0gZHJtX2Nvbm5l Y3Rvcl9zdGF0dXMKIGR3X21pcGlfZHNpX2RldGVjdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yLCBib29sIGZvcmNlKQogewotCXJldHVybiBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3Rl ZDsKKwlzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSA9IGNvbl90b19kc2koY29ubmVjdG9yKTsKKwor CisJaWYgKCFkc2ktPnBhbmVsKSB7CisJCWRzaS0+cGFuZWwgPSBvZl9kcm1fZmluZF9wYW5lbChk c2ktPnBhbmVsX25vZGUpOworCQlpZiAoZHNpLT5wYW5lbCkKKwkJCWRybV9wYW5lbF9hdHRhY2go ZHNpLT5wYW5lbCwgJmRzaS0+Y29ubmVjdG9yKTsKKwl9IGVsc2UgaWYgKCFkc2ktPnBhbmVsX25v ZGUpIHsKKwkJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOworCisJCWVuY29kZXIgPSBwbGF0 Zm9ybV9nZXRfZHJ2ZGF0YSh0b19wbGF0Zm9ybV9kZXZpY2UoZHNpLT5kZXYpKTsKKwkJZHdfbWlw aV9kc2lfZW5jb2Rlcl9kaXNhYmxlKGVuY29kZXIpOworCQlkcm1fcGFuZWxfZGV0YWNoKGRzaS0+ cGFuZWwpOworCQlkc2ktPnBhbmVsID0gTlVMTDsKKwl9CisKKwlpZiAoZHNpLT5wYW5lbCkKKwkJ cmV0dXJuIGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVjdGVkOworCisJcmV0dXJuIGNvbm5lY3Rvcl9z dGF0dXNfZGlzY29ubmVjdGVkOwogfQogCiBzdGF0aWMgdm9pZCBkd19taXBpX2RzaV9kcm1fY29u bmVjdG9yX2Rlc3Ryb3koc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKIHsKIAlkcm1f Y29ubmVjdG9yX3VucmVnaXN0ZXIoY29ubmVjdG9yKTsKIAlkcm1fY29ubmVjdG9yX2NsZWFudXAo Y29ubmVjdG9yKTsKKwljb25uZWN0b3ItPmRldiA9IE5VTEw7CiB9CiAKIHN0YXRpYyBzdHJ1Y3Qg ZHJtX2Nvbm5lY3Rvcl9mdW5jcyBkd19taXBpX2RzaV9hdG9taWNfY29ubmVjdG9yX2Z1bmNzID0g ewpAQCAtMTA2OSw2ICsxMDkyLDggQEAgc3RhdGljIGludCBkd19taXBpX2RzaV9yZWdpc3Rlcihz dHJ1Y3QgZHJtX2RldmljZSAqZHJtLAogCQlyZXR1cm4gcmV0OwogCX0KIAorCWNvbm5lY3Rvci0+ cG9sbGVkID0gRFJNX0NPTk5FQ1RPUl9QT0xMX0hQRDsKKwogCWRybV9jb25uZWN0b3JfaGVscGVy X2FkZChjb25uZWN0b3IsCiAJCQkmZHdfbWlwaV9kc2lfY29ubmVjdG9yX2hlbHBlcl9mdW5jcyk7 CiAKQEAgLTEyMjUsNiArMTI1MCw4IEBAIHN0YXRpYyB2b2lkIGR3X21pcGlfZHNpX3VuYmluZChz dHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3RlciwKIHsKIAlzdHJ1Y3QgZHdf bWlwaV9kc2kgKmRzaSA9IGRldl9nZXRfZHJ2ZGF0YShkZXYpOwogCisJZHdfbWlwaV9kc2lfZW5j b2Rlcl9kaXNhYmxlKCZkc2ktPmVuY29kZXIpOworCiAJbWlwaV9kc2lfaG9zdF91bnJlZ2lzdGVy KCZkc2ktPmRzaV9ob3N0KTsKIAlwbV9ydW50aW1lX2Rpc2FibGUoZGV2KTsKIAljbGtfZGlzYWJs ZV91bnByZXBhcmUoZHNpLT5wbGxyZWZfY2xrKTsKLS0gCjIuNi4zCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Fri, 8 Jul 2016 17:04:59 +0800 Subject: [PATCH 5/7] drm/rockchip: dw-mipi: support HPD poll In-Reply-To: <1467968701-15620-1-git-send-email-zyw@rock-chips.com> References: <1467968701-15620-1-git-send-email-zyw@rock-chips.com> Message-ID: <1467968701-15620-6-git-send-email-zyw@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org At the first time of bind, there is no any panel attach in mipi. Add a DRM_CONNECTOR_POLL_HPD porperty to detect the panel status, when panel probe, the dw_mipi_dsi_host_attach would be called, then mipi-dsi will trigger a event to notify the drm framework. Signed-off-by: Chris Zhong --- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 41 ++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index 15ba796..72d7f48 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -285,6 +285,7 @@ struct dw_mipi_dsi { struct drm_encoder encoder; struct drm_connector connector; struct mipi_dsi_host dsi_host; + struct device_node *panel_node; struct drm_panel *panel; struct device *dev; struct regmap *grf_regmap; @@ -462,7 +463,6 @@ static int dw_mipi_dsi_phy_init(struct dw_mipi_dsi *dsi) dsi_write(dsi, DSI_PHY_RSTZ, PHY_ENFORCEPLL | PHY_ENABLECLK | PHY_UNRSTZ | PHY_UNSHUTDOWNZ); - ret = readx_poll_timeout(readl, dsi->base + DSI_PHY_STATUS, val, val & LOCK, 1000, PHY_STATUS_TIMEOUT_US); if (ret < 0) { @@ -550,11 +550,11 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host, dsi->lanes = device->lanes; dsi->channel = device->channel; dsi->format = device->format; - dsi->panel = of_drm_find_panel(device->dev.of_node); - if (dsi->panel) - return drm_panel_attach(dsi->panel, &dsi->connector); + dsi->panel_node = device->dev.of_node; + if (dsi->connector.dev) + drm_helper_hpd_irq_event(dsi->connector.dev); - return -EINVAL; + return 0; } static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host, @@ -562,7 +562,10 @@ static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host, { struct dw_mipi_dsi *dsi = host_to_dsi(host); - drm_panel_detach(dsi->panel); + dsi->panel_node = NULL; + + if (dsi->connector.dev) + drm_helper_hpd_irq_event(dsi->connector.dev); return 0; } @@ -1022,13 +1025,33 @@ static struct drm_connector_helper_funcs dw_mipi_dsi_connector_helper_funcs = { static enum drm_connector_status dw_mipi_dsi_detect(struct drm_connector *connector, bool force) { - return connector_status_connected; + struct dw_mipi_dsi *dsi = con_to_dsi(connector); + + + if (!dsi->panel) { + dsi->panel = of_drm_find_panel(dsi->panel_node); + if (dsi->panel) + drm_panel_attach(dsi->panel, &dsi->connector); + } else if (!dsi->panel_node) { + struct drm_encoder *encoder; + + encoder = platform_get_drvdata(to_platform_device(dsi->dev)); + dw_mipi_dsi_encoder_disable(encoder); + drm_panel_detach(dsi->panel); + dsi->panel = NULL; + } + + if (dsi->panel) + return connector_status_connected; + + return connector_status_disconnected; } static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector) { drm_connector_unregister(connector); drm_connector_cleanup(connector); + connector->dev = NULL; } static struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = { @@ -1069,6 +1092,8 @@ static int dw_mipi_dsi_register(struct drm_device *drm, return ret; } + connector->polled = DRM_CONNECTOR_POLL_HPD; + drm_connector_helper_add(connector, &dw_mipi_dsi_connector_helper_funcs); @@ -1225,6 +1250,8 @@ static void dw_mipi_dsi_unbind(struct device *dev, struct device *master, { struct dw_mipi_dsi *dsi = dev_get_drvdata(dev); + dw_mipi_dsi_encoder_disable(&dsi->encoder); + mipi_dsi_host_unregister(&dsi->dsi_host); pm_runtime_disable(dev); clk_disable_unprepare(dsi->pllref_clk); -- 2.6.3