From patchwork Thu Aug 13 22:06:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 11716549 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 86C94722 for ; Mon, 17 Aug 2020 07:06:59 +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 64C892072D for ; Mon, 17 Aug 2020 07:06:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bHsUBV2c" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 64C892072D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 A5EC46E450; Mon, 17 Aug 2020 07:06:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF7F96E264 for ; Thu, 13 Aug 2020 22:07:08 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id i19so3833780lfj.8 for ; Thu, 13 Aug 2020 15:07:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OmsWTXLXrvD6z5b5tExtN9EHdrhOpOALjSmo38Bf/sM=; b=bHsUBV2c+Fb4ZHulGsBDExf4/jndEYU2MzlugJ91C8gez/F2GbPCeYUtHw/olcx6xu z6mvJVUs6ZRR5Gq+z9biQNy8XYA3LF8lxRokyP4Z/eLFfrtKNxWblmEBUFl1HG4xIZFa MrR3SBEf1N5N81LFFSe5txHra/EEKIzih0sfkcevw+Y7nhkLFAzy9I6y9vxcAcv7dLcd U3HHgAEJIYfgwx4iGmB/D9IimEozUB29fdNamh4XmKoi65n3f5npzBTslbReqaiQtjB0 NaAb3mkTA69f1a/Q4tOJ6HyGoaQ01ZEwodKyjVBmdBg0va1kP07asK26FeHo8Kdeo96s K1Qg== 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:mime-version:content-transfer-encoding; bh=OmsWTXLXrvD6z5b5tExtN9EHdrhOpOALjSmo38Bf/sM=; b=Y5E/tezoosj8LOkW4qw9kV5V8oeWPgxpUM/rvzfPV+Spsx9G5ezLr4rlkZ7cryFcg0 xkeSplDW3Y5hbGa2q9hDUcakHa4CtsXqoiFDHBV+2W16fc7YIsJH6Az66qg45O610PN+ sHFb2mNSk2RFreplHTBAcoANDaKPsU/oBsQ40HP2lOYrXMCeQbh4hD2l/mzdCt8aNtEj ZScf7XwPsox+Me03U9rH+h6YVGTSaX7oRXGk2S5EPkUtt9/hk0/U+ZzP/m2AFL+SNj7F SOdEa0zEYPb2WeRwgJB7r3RZ4yhXuoZ03XG/zJnIAh1h8jgm8ej/0Aj3LtjBZxi+y2uu tDDQ== X-Gm-Message-State: AOAM532di+lDRmqIxVfWqr3BLtv/JSP4uyI9eJYeIvocjbgp9v13bsD6 H7Ky3HY5QUVmJU2ck993HKo= X-Google-Smtp-Source: ABdhPJxCt+Urw+PLB7gAAG5UmAyBWVnprNQVRC60kwA0gCpR2CL3zlDyHyK5rVP2E75qDpmJhCtR4g== X-Received: by 2002:a05:6512:2010:: with SMTP id a16mr3080487lfb.196.1597356427346; Thu, 13 Aug 2020 15:07:07 -0700 (PDT) Received: from localhost.localdomain (109-252-170-211.dynamic.spd-mgts.ru. [109.252.170.211]) by smtp.gmail.com with ESMTPSA id z20sm1354452ljk.97.2020.08.13.15.07.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2020 15:07:06 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Sam Ravnborg , Laurent Pinchart Subject: [PATCH RESEND v10 3/4] drm/tegra: output: rgb: Support LVDS encoder bridge Date: Fri, 14 Aug 2020 01:06:55 +0300 Message-Id: <20200813220656.30838-4-digetx@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200813220656.30838-1-digetx@gmail.com> References: <20200813220656.30838-1-digetx@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 17 Aug 2020 07:06:11 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Newer Tegra device-trees will specify a video output graph, which involves LVDS encoder bridge. This patch adds support for the LVDS encoder bridge to the RGB output, allowing us to model the display hardware properly. Reviewed-by: Laurent Pinchart Acked-by: Sam Ravnborg Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/rgb.c | 58 +++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c index 0562a7eb793f..9a7024ec96bc 100644 --- a/drivers/gpu/drm/tegra/rgb.c +++ b/drivers/gpu/drm/tegra/rgb.c @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -267,24 +268,63 @@ int tegra_dc_rgb_remove(struct tegra_dc *dc) int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc) { struct tegra_output *output = dc->rgb; + struct drm_connector *connector; int err; if (!dc->rgb) return -ENODEV; - drm_connector_init(drm, &output->connector, &tegra_rgb_connector_funcs, - DRM_MODE_CONNECTOR_LVDS); - drm_connector_helper_add(&output->connector, - &tegra_rgb_connector_helper_funcs); - output->connector.dpms = DRM_MODE_DPMS_OFF; - drm_simple_encoder_init(drm, &output->encoder, DRM_MODE_ENCODER_LVDS); drm_encoder_helper_add(&output->encoder, &tegra_rgb_encoder_helper_funcs); - drm_connector_attach_encoder(&output->connector, - &output->encoder); - drm_connector_register(&output->connector); + /* + * Tegra devices that have LVDS panel utilize LVDS encoder bridge + * for converting up to 28 LCD LVTTL lanes into 5/4 LVDS lanes that + * go to display panel's receiver. + * + * Encoder usually have a power-down control which needs to be enabled + * in order to transmit data to the panel. Historically devices that + * use an older device-tree version didn't model the bridge, assuming + * that encoder is turned ON by default, while today's DRM allows us + * to model LVDS encoder properly. + * + * Newer device-trees utilize LVDS encoder bridge, which provides + * us with a connector and handles the display panel. + * + * For older device-trees we fall back to our own connector and use + * nvidia,panel phandle. + */ + if (output->bridge) { + err = drm_bridge_attach(&output->encoder, output->bridge, + NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR); + if (err) { + dev_err(output->dev, "failed to attach bridge: %d\n", + err); + return err; + } + + connector = drm_bridge_connector_init(drm, &output->encoder); + if (IS_ERR(connector)) { + dev_err(output->dev, + "failed to initialize bridge connector: %pe\n", + connector); + return PTR_ERR(connector); + } + + drm_connector_attach_encoder(connector, &output->encoder); + } else { + drm_connector_init(drm, &output->connector, + &tegra_rgb_connector_funcs, + DRM_MODE_CONNECTOR_LVDS); + drm_connector_helper_add(&output->connector, + &tegra_rgb_connector_helper_funcs); + output->connector.dpms = DRM_MODE_DPMS_OFF; + + drm_connector_attach_encoder(&output->connector, + &output->encoder); + drm_connector_register(&output->connector); + } err = tegra_output_init(drm, output); if (err < 0) {