* [PATCH v3 3/4] dt-bindings: Add ANX7688 HDMI to DP bridge binding
[not found] <20200306141217.423914-1-enric.balletbo@collabora.com>
@ 2020-03-06 14:12 ` Enric Balletbo i Serra
2020-03-06 14:12 ` [PATCH v3 4/4] drm/bridge: anx7688: Add ANX7688 bridge driver support Enric Balletbo i Serra
1 sibling, 0 replies; 3+ messages in thread
From: Enric Balletbo i Serra @ 2020-03-06 14:12 UTC (permalink / raw)
To: linux-kernel
Cc: megous, devicetree, drinkcat, Neil Armstrong, David Airlie,
dri-devel, anarsoul, Andrzej Hajda, Rob Herring, hsinyi,
matthias.bgg, Mark Rutland, Collabora Kernel ML, icenowy
From: Nicolas Boichat <drinkcat@chromium.org>
Add documentation for DT properties supported by the ANX7688 HDMI-DP
converter.
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
Changes in v3:
- Adapt the bridge bindings for the multi-function device.
Changes in v2:
- Improve a bit the descriptions using the info from the datasheet.
- Convert binding to yaml.
- Use dual licensing.
.../bridge/analogix,anx7688-bridge.yaml | 80 +++++++++++++++++++
1 file changed, 80 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix,anx7688-bridge.yaml
diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7688-bridge.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7688-bridge.yaml
new file mode 100644
index 000000000000..c56da3f39dd8
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7688-bridge.yaml
@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/display/bridge/analogix,anx7688-bridge.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Analogix ANX7688 HDMI to DisplayPort Bridge
+
+maintainers:
+ - Nicolas Boichat <drinkcat@chromium.org>
+ - Enric Balletbo i Serra <enric.balletbo@collabora.com>
+
+description: |
+ The ANX7688 bridge describes the HDMI 2.0 to DisplayPort 1.3 bridge block
+ included in the ANX7688 chip controller. These are meant to be used for
+ controlling display-related signals.
+
+ The node of this device should be under an analogix,anx7866 node. Please refer
+ to Documentation/devicetree/bindings/mfd/analogix,anx7688.yaml for the ANX7688
+ core bindings.
+
+properties:
+ compatible:
+ const: analogix,anx7688-bridge
+
+ ports:
+ type: object
+
+ properties:
+ port@0:
+ type: object
+ description: |
+ Video port for HDMI input
+
+ port@1:
+ type: object
+ description: |
+ Video port for DP output
+
+ required:
+ - port@0
+
+required:
+ - compatible
+ - ports
+
+examples:
+ - |
+ i2c0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ anx7688: anx7688@2c {
+ compatible = "analogix,anx7688";
+ reg = <0x2c>;
+
+ bridge {
+ compatible = "analogix,anx7688-bridge";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ anx7688_in: endpoint {
+ remote-endpoint = <&hdmi0_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ anx7688_out: endpoint {
+ remote-endpoint = <&typec0_connector>;
+ };
+ };
+ };
+ };
+ };
+ };
--
2.25.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v3 4/4] drm/bridge: anx7688: Add ANX7688 bridge driver support
[not found] <20200306141217.423914-1-enric.balletbo@collabora.com>
2020-03-06 14:12 ` [PATCH v3 3/4] dt-bindings: Add ANX7688 HDMI to DP bridge binding Enric Balletbo i Serra
@ 2020-03-06 14:12 ` Enric Balletbo i Serra
2020-03-07 1:04 ` kbuild test robot
1 sibling, 1 reply; 3+ messages in thread
From: Enric Balletbo i Serra @ 2020-03-06 14:12 UTC (permalink / raw)
To: linux-kernel
Cc: megous, Jernej Skrabec, drinkcat, Laurent Pinchart,
Neil Armstrong, David Airlie, Torsten Duwe, Jonas Karlman,
dri-devel, anarsoul, Andrzej Hajda, Maxime Ripard, hsinyi,
matthias.bgg, Thomas Gleixner, Collabora Kernel ML, icenowy
From: Nicolas Boichat <drinkcat@chromium.org>
This driver adds support for the ANX7688 HDMI to DP converter block of the
ANX7688 multi-function device.
For our use case, the only reason the Linux kernel driver is necessary is
to reject resolutions that require more bandwidth than what is available
on the DP side. DP bandwidth and lane count are reported by the bridge via
2 registers and, as far as we know, only for chips that have a firmware
version greather than 0.85 supports these two registers.
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
---
Changes in v3:
- Convert to a child of ANX7688 multi-function device.
Changes in v2:
- Move driver to drivers/gpu/drm/bridge/analogix.
- Make the driver OF only so we can reduce the ifdefs.
- Update the Copyright to 2020.
- Use probe_new so we can get rid of the i2c_device_id table.
drivers/gpu/drm/bridge/analogix/Kconfig | 9 ++
drivers/gpu/drm/bridge/analogix/Makefile | 1 +
.../drm/bridge/analogix/analogix-anx7688.c | 135 ++++++++++++++++++
3 files changed, 145 insertions(+)
create mode 100644 drivers/gpu/drm/bridge/analogix/analogix-anx7688.c
diff --git a/drivers/gpu/drm/bridge/analogix/Kconfig b/drivers/gpu/drm/bridge/analogix/Kconfig
index e1fa7d820373..02c420ba79bd 100644
--- a/drivers/gpu/drm/bridge/analogix/Kconfig
+++ b/drivers/gpu/drm/bridge/analogix/Kconfig
@@ -11,6 +11,15 @@ config DRM_ANALOGIX_ANX6345
ANX6345 transforms the LVTTL RGB output of an
application processor to eDP or DisplayPort.
+config DRM_ANALOGIX_ANX7688
+ tristate "Analogix ANX7688 bridge"
+ select DRM_KMS_HELPER
+ select MFD_ANX7688
+ help
+ ANX7688 is an ultra-low power 4k Ultra-HD (4096x2160p60)
+ mobile HD transmitter designed for portable devices. The
+ ANX7688 converts HDMI 2.0 to DisplayPort 1.3 Ultra-HD.
+
config DRM_ANALOGIX_ANX78XX
tristate "Analogix ANX78XX bridge"
select DRM_ANALOGIX_DP
diff --git a/drivers/gpu/drm/bridge/analogix/Makefile b/drivers/gpu/drm/bridge/analogix/Makefile
index 97669b374098..27cd73635c8c 100644
--- a/drivers/gpu/drm/bridge/analogix/Makefile
+++ b/drivers/gpu/drm/bridge/analogix/Makefile
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o analogix-i2c-dptx.o
obj-$(CONFIG_DRM_ANALOGIX_ANX6345) += analogix-anx6345.o
+obj-$(CONFIG_DRM_ANALOGIX_ANX7688) += analogix-anx7688.o
obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o
obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o
diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx7688.c b/drivers/gpu/drm/bridge/analogix/analogix-anx7688.c
new file mode 100644
index 000000000000..81b950ecde27
--- /dev/null
+++ b/drivers/gpu/drm/bridge/analogix/analogix-anx7688.c
@@ -0,0 +1,135 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * ANX7688 HDMI->DP bridge driver
+ *
+ * Copyright 2020 Google LLC
+ */
+
+#include <linux/mfd/anx7688.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <drm/drm_bridge.h>
+#include <drm/drm_print.h>
+
+struct anx7688_bridge_data {
+ struct drm_bridge bridge;
+ struct regmap *regmap;
+
+ bool filter;
+};
+
+static inline struct anx7688_bridge_data *
+bridge_to_anx7688(struct drm_bridge *bridge)
+{
+ return container_of(bridge, struct anx7688_bridge_data, bridge);
+}
+
+static bool anx7688_bridge_mode_fixup(struct drm_bridge *bridge,
+ const struct drm_display_mode *mode,
+ struct drm_display_mode *adjusted_mode)
+{
+ struct anx7688_bridge_data *data = bridge_to_anx7688(bridge);
+ int totalbw, requiredbw;
+ u8 dpbw, lanecount;
+ u8 regs[2];
+ int ret;
+
+ if (!data->filter)
+ return true;
+
+ /* Read both regs 0x85 (bandwidth) and 0x86 (lane count). */
+ ret = regmap_bulk_read(data->regmap, ANX7688_DP_BANDWIDTH_REG, regs,
+ 2);
+ if (ret < 0) {
+ DRM_ERROR("Failed to read bandwidth/lane count\n");
+ return false;
+ }
+ dpbw = regs[0];
+ lanecount = regs[1];
+
+ /* Maximum 0x19 bandwidth (6.75 Gbps Turbo mode), 2 lanes */
+ if (dpbw > 0x19 || lanecount > 2) {
+ DRM_ERROR("Invalid bandwidth/lane count (%02x/%d)\n", dpbw,
+ lanecount);
+ return false;
+ }
+
+ /* Compute available bandwidth (kHz) */
+ totalbw = dpbw * lanecount * 270000 * 8 / 10;
+
+ /* Required bandwidth (8 bpc, kHz) */
+ requiredbw = mode->clock * 8 * 3;
+
+ DRM_DEBUG_KMS("DP bandwidth: %d kHz (%02x/%d); mode requires %d Khz\n",
+ totalbw, dpbw, lanecount, requiredbw);
+
+ if (totalbw == 0) {
+ DRM_ERROR("Bandwidth/lane count are 0, not rejecting modes\n");
+ return true;
+ }
+
+ return totalbw >= requiredbw;
+}
+
+static const struct drm_bridge_funcs anx7688_bridge_funcs = {
+ .mode_fixup = anx7688_bridge_mode_fixup,
+};
+
+static int anx7688_bridge_probe(struct platform_device *pdev)
+{
+ struct anx7688 *anx7688 = dev_get_drvdata(pdev->dev.parent);
+ struct anx7688_bridge_data *data;
+ struct device *dev = &pdev->dev;
+
+ data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ data->bridge.of_node = dev->of_node;
+ data->regmap = anx7688->regmap;
+
+ /* FW version >= 0.85 supports bandwidth/lane count registers */
+ if (anx7688->fw_version >= ANX7688_MINIMUM_FW_VERSION)
+ data->filter = true;
+ else
+ /* Warn, but not fail, for backwards compatibility */
+ DRM_WARN("Old ANX7688 FW version (0x%04x), not filtering\n",
+ anx7688->fw_version);
+
+ data->bridge.funcs = &anx7688_bridge_funcs;
+ drm_bridge_add(&data->bridge);
+
+ return 0;
+}
+
+static int anx7688_bridge_remove(struct platform_device *pdev)
+{
+ struct anx7688_bridge_data *data = dev_get_drvdata(&pdev->dev);
+
+ drm_bridge_remove(&data->bridge);
+
+ return 0;
+}
+
+static const struct of_device_id anx7688_bridge_match_table[] = {
+ { .compatible = "analogix,anx7688-bridge", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, anx7688_bridge_match_table);
+
+static struct platform_driver anx7688_bridge_driver = {
+ .probe = anx7688_bridge_probe,
+ .remove = anx7688_bridge_remove,
+ .driver = {
+ .name = "anx7688-bridge",
+ .of_match_table = anx7688_bridge_match_table,
+ },
+};
+
+module_platform_driver(anx7688_bridge_driver);
+
+MODULE_DESCRIPTION("ANX7688 HDMI->DP bridge driver");
+MODULE_AUTHOR("Nicolas Boichat <drinkcat@chromium.org>");
+MODULE_AUTHOR("Enric Balletbo i Serra <enric.balletbo@collabora.com>");
+MODULE_LICENSE("GPL");
--
2.25.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread