From patchwork Thu Aug 29 06:05:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11120393 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0E62314D5 for ; Thu, 29 Aug 2019 06:06:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1865233A1 for ; Thu, 29 Aug 2019 06:06:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1865233A1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 93B6389FE3; Thu, 29 Aug 2019 06:06:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F2B689FCC for ; Thu, 29 Aug 2019 06:06:02 +0000 (UTC) Received: by mail-pg1-x543.google.com with SMTP id m3so985776pgv.13 for ; Wed, 28 Aug 2019 23:06:02 -0700 (PDT) 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; bh=eMIJ3TsGhGRnuDNUUwc9l4LSobYBmRitdXnR8ZzJ74U=; b=e0KYV7OnbtgxXfD8WCd2yY5KY2IsCjjOAxRls9Ld6So1jl4Xh2Xzq0y0NF4cndlVde beWRBKc1vtobZnZXI6PEt7seZMQF0TJAoiV8xmYxu2zOv69yGfVk+qsbY0jAZGlXo6rI PeRTTfazSS2fLHkNk8lEVOeGBh4gMq1KlfNaBuiARo6gjmetIpzsHlieDvE9aSDy00H8 4WBGUMFr7dwCh48LkIDYsh0xIQbhclItw8SNKK+4dIb8/11122jkyB2lGy2fgvI8RjaQ 0I8Q+BmittZFPjgV5YCgTi+3Odyh6WBmRMP+nKLC+NaJhw2Uv1pmR41LNaAuZxuzaVJf lb5g== X-Gm-Message-State: APjAAAUXQLt7pcTLMHIgqRRXJB0w9z7m/rIOS8doj2IBHph4j04QpQIH oYoJ/v3GbhsjoJryONQZAeexBQ== X-Google-Smtp-Source: APXvYqyNUXSxwwJvVKiyeJmH5S2YfzX34ueJxZOAozvHNaJhvrDmMYSk/wPXaSO8RPguBig9q6Iy7A== X-Received: by 2002:a65:6152:: with SMTP id o18mr6507955pgv.279.1567058760907; Wed, 28 Aug 2019 23:06:00 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id a6sm1504397pfa.162.2019.08.28.23.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 23:06:00 -0700 (PDT) From: John Stultz To: lkml Subject: [RFC][PATCH] drm: kirin: Fix dsi probe/attach logic Date: Thu, 29 Aug 2019 06:05:50 +0000 Message-Id: <20190829060550.62095-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=eMIJ3TsGhGRnuDNUUwc9l4LSobYBmRitdXnR8ZzJ74U=; b=eQ1LpoJsZsj+y0hpH5fbRMtmOsIeHPLYeOUl7EV7TPv9Alp6hnVmYUlBqiJ1LPjKLc TZ3MvG2VKp8n7i1bTTjar/PCjptvFh/iTHeXAcKFcmJLt4oaJnpJY0yn5GjN3ARMrWUc tQj0cIlhCJj4R30g4+Huh6uF2W9e94AM42pZUebGhRLersAUdVLtzw1aM/N+32Oe/LdI KcGJGlfMYabqhQeABTnmZmmcwA3/Ux7HWLmk9In+wHtCQ1AE7nenJpkSAzqTfU7WkiKk BmU/zIFSLMUAucQHecW9+6PAUgr+Nzko5xNGAmt3QAAqyasd9s+mtXMXMXC0u5324V+d 0jEg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jernej Skrabec , Neil Armstrong , David Airlie , Jonas Karlman , "dri-devel@lists.freedesktop.org" , Xinliang Liu , Thierry Reding , Laurent Pinchart , Rongrong Zou , Sean Paul , Sam Ravnborg , Matt Redfearn MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Since commit 83f35bc3a852 ("drm/bridge: adv7511: Attach to DSI host at probe time") landed in -next the HiKey board would fail to boot, looping: adv7511 2-0039: failed to find dsi host messages over and over. Andrzej Hajda suggested this is due to a circular dependency issue, and that the adv7511 change is correcting the improper order used earlier. Unfortunately this means the DSI drivers that use adv7511 need to also need to be updated to use the proper ordering to continue to work. This patch tries to reorder the initialization to register the dsi_host first, and then call component_add via dsi_host_attach, instead of doing that at probe time. This seems to resolve the issue with the HiKey board. Cc: Andrzej Hajda Cc: Matt Redfearn Cc: Xinliang Liu Cc: Rongrong Zou Cc: Laurent Pinchart Cc: Neil Armstrong Cc: Jonas Karlman Cc: Jernej Skrabec Cc: Thierry Reding Cc: David Airlie , Cc: Sean Paul Cc: Sam Ravnborg Cc: "dri-devel@lists.freedesktop.org" Fixes: 83f35bc3a852 ("drm/bridge: adv7511: Attach to DSI host at probe time") Signed-off-by: John Stultz --- Note: I'm really not super familiar with the DSI code here, and am mostly just trying to refactor the existing code in a similar fashion to the suggested dw-mipi-dsi-rockchip.c implementation. Careful review would be greatly appreciated! Also there is an outstanding regression on the db410c since it similarly uses the adv7511 and probably needs a similar rework. --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 111 ++++++++++--------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index 5bf8138941de..696cee1a1219 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -79,6 +79,7 @@ struct dsi_hw_ctx { }; struct dw_dsi { + struct device *dev; struct drm_encoder encoder; struct drm_bridge *bridge; struct mipi_dsi_host host; @@ -724,51 +725,6 @@ static int dw_drm_encoder_init(struct device *dev, return 0; } -static int dsi_host_attach(struct mipi_dsi_host *host, - struct mipi_dsi_device *mdsi) -{ - struct dw_dsi *dsi = host_to_dsi(host); - - if (mdsi->lanes < 1 || mdsi->lanes > 4) { - DRM_ERROR("dsi device params invalid\n"); - return -EINVAL; - } - - dsi->lanes = mdsi->lanes; - dsi->format = mdsi->format; - dsi->mode_flags = mdsi->mode_flags; - - return 0; -} - -static int dsi_host_detach(struct mipi_dsi_host *host, - struct mipi_dsi_device *mdsi) -{ - /* do nothing */ - return 0; -} - -static const struct mipi_dsi_host_ops dsi_host_ops = { - .attach = dsi_host_attach, - .detach = dsi_host_detach, -}; - -static int dsi_host_init(struct device *dev, struct dw_dsi *dsi) -{ - struct mipi_dsi_host *host = &dsi->host; - int ret; - - host->dev = dev; - host->ops = &dsi_host_ops; - ret = mipi_dsi_host_register(host); - if (ret) { - DRM_ERROR("failed to register dsi host\n"); - return ret; - } - - return 0; -} - static int dsi_bridge_init(struct drm_device *dev, struct dw_dsi *dsi) { struct drm_encoder *encoder = &dsi->encoder; @@ -796,10 +752,6 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) if (ret) return ret; - ret = dsi_host_init(dev, dsi); - if (ret) - return ret; - ret = dsi_bridge_init(drm_dev, dsi); if (ret) return ret; @@ -817,13 +769,22 @@ static const struct component_ops dsi_ops = { .unbind = dsi_unbind, }; -static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) +static int dsi_host_attach(struct mipi_dsi_host *host, + struct mipi_dsi_device *mdsi) { - struct dsi_hw_ctx *ctx = dsi->ctx; - struct device_node *np = pdev->dev.of_node; - struct resource *res; + struct dw_dsi *dsi = host_to_dsi(host); + struct device_node *np = dsi->dev->of_node; int ret; + if (mdsi->lanes < 1 || mdsi->lanes > 4) { + DRM_ERROR("dsi device params invalid\n"); + return -EINVAL; + } + + dsi->lanes = mdsi->lanes; + dsi->format = mdsi->format; + dsi->mode_flags = mdsi->mode_flags; + /* * Get the endpoint node. In our case, dsi has one output port1 * to which the external HDMI bridge is connected. @@ -832,6 +793,42 @@ static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) if (ret) return ret; + return component_add(dsi->dev, &dsi_ops); +} + +static int dsi_host_detach(struct mipi_dsi_host *host, + struct mipi_dsi_device *mdsi) +{ + /* do nothing */ + return 0; +} + +static const struct mipi_dsi_host_ops dsi_host_ops = { + .attach = dsi_host_attach, + .detach = dsi_host_detach, +}; + +static int dsi_host_init(struct device *dev, struct dw_dsi *dsi) +{ + struct mipi_dsi_host *host = &dsi->host; + int ret; + + host->dev = dev; + host->ops = &dsi_host_ops; + ret = mipi_dsi_host_register(host); + if (ret) { + DRM_ERROR("failed to register dsi host\n"); + return ret; + } + + return 0; +} + +static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) +{ + struct dsi_hw_ctx *ctx = dsi->ctx; + struct resource *res; + ctx->pclk = devm_clk_get(&pdev->dev, "pclk"); if (IS_ERR(ctx->pclk)) { DRM_ERROR("failed to get pclk clock\n"); @@ -862,15 +859,19 @@ static int dsi_probe(struct platform_device *pdev) } dsi = &data->dsi; ctx = &data->ctx; + dsi->dev = &pdev->dev; dsi->ctx = ctx; ret = dsi_parse_dt(pdev, dsi); if (ret) return ret; - platform_set_drvdata(pdev, data); + ret = dsi_host_init(&pdev->dev, dsi); + if (ret) + return ret; - return component_add(&pdev->dev, &dsi_ops); + platform_set_drvdata(pdev, data); + return 0; } static int dsi_remove(struct platform_device *pdev)