From patchwork Wed Jun 2 20:37:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 12295637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B0CDC47096 for ; Wed, 2 Jun 2021 20:37:43 +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 24FAA61008 for ; Wed, 2 Jun 2021 20:37:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24FAA61008 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de 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 712C26EE6D; Wed, 2 Jun 2021 20:37:42 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id 88F936EE6C for ; Wed, 2 Jun 2021 20:37:40 +0000 (UTC) Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id B5A8E82C9B; Wed, 2 Jun 2021 22:37:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1622666258; bh=VvBVFBPnwWvLw8jju1scxTT4dsm7ZkjjbxUCqXLJ2PY=; h=From:To:Cc:Subject:Date:From; b=dJ/P1Ts1Py5kYfTjGly4OWtZnRTTAWQMwX7wn7/+rIT3oCs/519hA4env2V+bY1B2 kwOm9m6uLW1tTO1D6HrwDf+pBWIuXwjhYnpZud233owXQzxkyZiRHIGC6jIpzLdR9D ib3pUdzEoEoAUmqVfMa8HlVP+THrCDZ868FU3VnpIK5FDsTxZu6+lPhe32NytoGci1 FwKdsN9LtxaYmvaqWJNkrziIrCTxJE2YKyrjS8geOviJIna/sV4wVJWM9Ybm3+Ppkw /V/RQTjhMrgidIijJ5/uSrU5Zn6/xmWoEhGr+dB6rVhc8w/gI9O1GU+mw5tqk9o7DH hAZGY4vJczxbw== From: Marek Vasut To: dri-devel@lists.freedesktop.org Subject: [PATCH V2 1/2] dt-bindings: display: bridge: lvds-codec: Document LVDS data mapping select Date: Wed, 2 Jun 2021 22:37:30 +0200 Message-Id: <20210602203731.419310-1-marex@denx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean 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: Marek Vasut , devicetree@vger.kernel.org, ch@denx.de, Rob Herring , Laurent Pinchart , Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Decoder input LVDS format is a property of the decoder chip or even its strapping. Add DT property data-mapping the same way lvds-panel does, to define the LVDS data mapping. Signed-off-by: Marek Vasut Cc: Laurent Pinchart Cc: Rob Herring Cc: Sam Ravnborg Cc: devicetree@vger.kernel.org To: dri-devel@lists.freedesktop.org Reviewed-by: Rob Herring --- V2: - Use allOf - Move the data-mapping to endpoint --- .../bindings/display/bridge/lvds-codec.yaml | 53 ++++++++++++++----- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml b/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml index cacafa61e3f52..c493d007785ca 100644 --- a/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml +++ b/Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml @@ -68,6 +68,18 @@ properties: For LVDS encoders, port 1 is the LVDS output For LVDS decoders, port 1 is the parallel output + properties: + endpoint: + properties: + data-mapping: + enum: + - jeida-18 + - jeida-24 + - vesa-24 + description: | + The color signals mapping order. See details in + Documentation/devicetree/bindings/display/panel/lvds.yaml + required: - port@0 - port@1 @@ -79,21 +91,38 @@ properties: power-supply: true -if: - not: - properties: - compatible: - contains: - const: lvds-encoder -then: - properties: - ports: +allOf: + - if: + not: + properties: + compatible: + contains: + const: lvds-encoder + then: + properties: + ports: + properties: + port@0: + properties: + endpoint: + properties: + pclk-sample: false + + - if: + not: + properties: + compatible: + contains: + const: lvds-decoder + then: properties: - port@0: + ports: properties: - endpoint: + port@1: properties: - pclk-sample: false + endpoint: + properties: + data-mapping: false required: - compatible From patchwork Wed Jun 2 20:37:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 12295635 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F35AC47093 for ; Wed, 2 Jun 2021 20:37:42 +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 6AE15613DE for ; Wed, 2 Jun 2021 20:37:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AE15613DE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de 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 EC8EF6EE69; Wed, 2 Jun 2021 20:37:41 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6C0D36EE69 for ; Wed, 2 Jun 2021 20:37:40 +0000 (UTC) Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 0981B82F33; Wed, 2 Jun 2021 22:37:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1622666259; bh=CTX07eRZ3MY1YEnrbwIfEKCFB3jD9a973ZShNGZHkEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YTAEmAJBXOtyaPf8dYBwTCKMRrtfHNfBG5JZudQNq8vLyK2d1djx8EZJC1+Hc3DOS RLFxt7Fg4LaUButftnawIL6mchtnrCHFuljz8JAnDvlHsWc0ui3feNe+mNYQ4/BnIJ Xvv8hBWXDisMWmWpqO3dNqMOeGSVTUf4oXih1Dr3Ts0QiMiUnz5frSvbLCDuqM5C2n rfCvghA6Jpn2kPDL5MkIJDKqjq7+2k/K/ml2wlUynjVAY0SukbKLDnkovRW8LiILvD ZPOxe5XIaqLkCv5SG+F4GafJns7QKlbLORjRzewZesqx7Ey3BA+nMDu8rHOeET8CjH 4bT5xC+A5oyBA== From: Marek Vasut To: dri-devel@lists.freedesktop.org Subject: [PATCH V2 2/2] drm/bridge: lvds-codec: Add support for LVDS data mapping select Date: Wed, 2 Jun 2021 22:37:31 +0200 Message-Id: <20210602203731.419310-2-marex@denx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210602203731.419310-1-marex@denx.de> References: <20210602203731.419310-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean 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: Marek Vasut , Sam Ravnborg , ch@denx.de, Laurent Pinchart Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Decoder input LVDS format is a property of the decoder chip or even its strapping. Handle data-mapping the same way lvds-panel does. In case data-mapping is not present, do nothing, since there are still legacy bindings which do not specify this property. Signed-off-by: Marek Vasut Cc: Laurent Pinchart Cc: Sam Ravnborg To: dri-devel@lists.freedesktop.org --- V2: - Move the data-mapping to endpoint --- drivers/gpu/drm/bridge/lvds-codec.c | 58 +++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/drivers/gpu/drm/bridge/lvds-codec.c b/drivers/gpu/drm/bridge/lvds-codec.c index 80ce6783d10a8..0719744e1cddb 100644 --- a/drivers/gpu/drm/bridge/lvds-codec.c +++ b/drivers/gpu/drm/bridge/lvds-codec.c @@ -23,6 +23,7 @@ struct lvds_codec { struct regulator *vcc; struct gpio_desc *powerdown_gpio; u32 connector_type; + unsigned int bus_format; }; static inline struct lvds_codec *to_lvds_codec(struct drm_bridge *bridge) @@ -69,10 +70,33 @@ static void lvds_codec_disable(struct drm_bridge *bridge) "Failed to disable regulator \"vcc\": %d\n", ret); } +static bool lvds_codec_mode_fixup(struct drm_bridge *bridge, + const struct drm_display_mode *mode, + struct drm_display_mode *adj) +{ + struct lvds_codec *lvds_codec = to_lvds_codec(bridge); + struct drm_encoder *encoder = bridge->encoder; + struct drm_device *ddev = encoder->dev; + struct drm_connector *connector; + + /* If 'data-mapping' was not specified, do nothing. */ + if (!lvds_codec->bus_format) + return true; + + /* Patch in the LVDS format */ + list_for_each_entry(connector, &ddev->mode_config.connector_list, head) { + drm_display_info_set_bus_formats(&connector->display_info, + &lvds_codec->bus_format, 1); + } + + return true; +} + static const struct drm_bridge_funcs funcs = { .attach = lvds_codec_attach, .enable = lvds_codec_enable, .disable = lvds_codec_disable, + .mode_fixup = lvds_codec_mode_fixup, }; static int lvds_codec_probe(struct platform_device *pdev) @@ -82,7 +106,9 @@ static int lvds_codec_probe(struct platform_device *pdev) struct device_node *bus_node; struct drm_panel *panel; struct lvds_codec *lvds_codec; + const char *mapping; u32 val; + int ret; lvds_codec = devm_kzalloc(dev, sizeof(*lvds_codec), GFP_KERNEL); if (!lvds_codec) @@ -143,6 +169,38 @@ static int lvds_codec_probe(struct platform_device *pdev) of_node_put(bus_node); } + /* + * Decoder input LVDS format is a property of the decoder chip or even + * its strapping. Handle data-mapping the same way lvds-panel does. In + * case data-mapping is not present, do nothing, since there are still + * legacy bindings which do not specify this property. + */ + if (lvds_codec->connector_type != DRM_MODE_CONNECTOR_LVDS) { + bus_node = of_graph_get_endpoint_by_regs(dev->of_node, 1, 0); + if (!bus_node) { + dev_dbg(dev, "bus DT node not found\n"); + return -ENXIO; + } + + ret = of_property_read_string(bus_node, "data-mapping", + &mapping); + of_node_put(bus_node); + if (ret < 0) { + dev_err(dev, "missing 'data-mapping' DT property\n"); + } else { + if (!strcmp(mapping, "jeida-18")) { + lvds_codec->bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG; + } else if (!strcmp(mapping, "jeida-24")) { + lvds_codec->bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA; + } else if (!strcmp(mapping, "vesa-24")) { + lvds_codec->bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG; + } else { + dev_err(dev, "invalid 'data-mapping' DT property\n"); + return -EINVAL; + } + } + } + /* * The panel_bridge bridge is attached to the panel's of_node, * but we need a bridge attached to our of_node for our user