drm: bridge: anx7688 and an optional feature
Subsystems (4)
cover drm: bridge: anx7688 and an optional feature
[Resend to cc more reviewers]
This series is to add anx7688 bridge driver. It is extended from previous work[1].
The first 2 patches are same as previous version, with some modification due to drm core function changes and use regmap abstraction.
We add an optional feature bypass-gpios so that driver can decide if it serves as simple pass-thru by reading GPIO values, which is controlled by hardware.
[1] https://lore.kernel.org/lkml/[email protected]/
Hsin-Yi Wang (2):
dt-bindings: drm/bridge: analogix-anx78xx: support bypass GPIO
drm: bridge: anx7688: Support bypass GPIO feature
Nicolas Boichat (2):
dt-bindings: drm/bridge: analogix-anx7688: Add ANX7688 transmitter
binding
drm: bridge: anx7688: Add anx7688 bridge driver support.
.../bindings/display/bridge/anx7688.txt | 70 +++++ drivers/gpu/drm/bridge/Kconfig | 9 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/analogix-anx7688.c | 260 ++++++++++++++++++ 4 files changed, 340 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/anx7688.txt create mode 100644 drivers/gpu/drm/bridge/analogix-anx7688.c
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
PATCH RESEND 1/4 dt-bindings: drm/bridge: analogix-anx7688: Add ANX7688 transmitter binding
From: Nicolas Boichat <[email protected]>
Add support for analogix,anx7688
--- .../bindings/display/bridge/anx7688.txt | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/anx7688.txt
Documentation/devicetree/bindings/display/bridge/anx7688.txt new file +32 -0
@@ -0,0 +1,32 @@ +Analogix ANX7688 SlimPort (Single-Chip Transmitter for DP over USB-C) +--------------------------------------------------------------------- + +The ANX7688 is a single-chip mobile transmitter to support 4K 60 frames per +second (4096x2160p60) or FHD 120 frames per second (1920x1080p120) video +resolution from a smartphone or tablet with full function USB-C. + +This binding only describes the HDMI to DP display bridge. + +Required properties: + + - compatible : "analogix,anx7688" + - reg : I2C address of the device (fixed at 0x2c) + +Optional properties: + + - Video port for HDMI input, using the DT bindings defined in [1]. + +[1]: Documentation/devicetree/bindings/media/video-interfaces.txt + +Example: + + anx7688: anx7688@2c { + compatible = "analogix,anx7688"; + reg = <0x2c>; + + port { + anx7688_in: endpoint { + remote-endpoint = <&hdmi0_out>; + }; + }; + };
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Laurent Pinchart
reviewerRe: [PATCH RESEND 1/4] dt-bindings: drm/bridge: analogix-anx7688: Add ANX7688 transmitter binding
Hi Hsin-Yi,
Thank you for the patch.
Quoted 8 lines · Hsin-Yi Wang
From: Nicolas Boichat <[email protected]>
Add support for analogix,anx7688
Signed-off-by Nicolas Boichat <[email protected]>Signed-off-by Hsin-Yi Wang <[email protected]>--- .../bindings/display/bridge/anx7688.txt | 32 +++++++++++++++++++
How about converting this to yaml bindings already ? It's fairly simple and gives you DT validation.
Quoted 44 lines
1 file changed, 32 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/anx7688.txtDocumentation/devicetree/bindings/display/bridge/anx7688.txt new file +32
-0@@ -0,0 +1,32 @@ +Analogix ANX7688 SlimPort (Single-Chip Transmitter for DP over USB-C) +--------------------------------------------------------------------- + +The ANX7688 is a single-chip mobile transmitter to support 4K 60 frames per +second (4096x2160p60) or FHD 120 frames per second (1920x1080p120) video +resolution from a smartphone or tablet with full function USB-C. + +This binding only describes the HDMI to DP display bridge. + +Required properties: + + - compatible : "analogix,anx7688" + - reg : I2C address of the device (fixed at 0x2c) + +Optional properties: + + - Video port for HDMI input, using the DT bindings defined in [1]. + +[1]: Documentation/devicetree/bindings/media/video-interfaces.txt + +Example: + + anx7688: anx7688@2c { + compatible = "analogix,anx7688"; + reg = <0x2c>; + + port { + anx7688_in: endpoint { + remote-endpoint = <&hdmi0_out>; + }; + }; + };Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Signature · 7 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH RESEND 1/4] dt-bindings: drm/bridge: analogix-anx7688: Add ANX7688 transmitter binding
On Mon, Dec 9, 2019 at 10:53 PM Laurent Pinchart
<[email protected]> wrote:
Hi Laurent,
Quoted 3 lines
How about converting this to yaml bindings already ? It's fairly simple and gives you DT validation.
Added in https://lore.kernel.org/lkml/[email protected]/T/#m183b3822bf60101666436b0244b27275c6765d20
Thanks
PATCH RESEND 2/4 drm: bridge: anx7688: Add anx7688 bridge driver support.
In reply to Hsin-Yi WangFrom: Nicolas Boichat <[email protected]>
ANX7688 is a HDMI to DP converter (as well as USB-C port controller), that has an internal microcontroller.
The only reason a 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 on I2C.
--- drivers/gpu/drm/bridge/Kconfig | 9 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/analogix-anx7688.c | 203 ++++++++++++++++++++++ 3 files changed, 213 insertions(+) create mode 100644 drivers/gpu/drm/bridge/analogix-anx7688.c
drivers/gpu/drm/bridge/Kconfig +9 -0
@@ -16,6 +16,15 @@ config DRM_PANEL_BRIDGE menu "Display Interface Bridges" depends on DRM && DRM_BRIDGE +config DRM_ANALOGIX_ANX7688 + tristate "Analogix ANX7688 bridge" + select DRM_KMS_HELPER + select REGMAP_I2C + ---help--- + ANX7688 is a transmitter to support DisplayPort over USB-C for + smartphone and tablets. + This driver only supports the HDMI to DP component of the chip. + config DRM_ANALOGIX_ANX78XX tristate "Analogix ANX78XX bridge" select DRM_KMS_HELPER
drivers/gpu/drm/bridge/Makefile +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_DRM_ANALOGIX_ANX7688) += analogix-anx7688.o obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o obj-$(CONFIG_DRM_CDNS_DSI) += cdns-dsi.o obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o
drivers/gpu/drm/bridge/analogix-anx7688.c new file +203 -0
203 lines not on this page · raw message
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
PATCH RESEND 3/4 dt-bindings: drm/bridge: analogix-anx78xx: support bypass GPIO
In reply to Hsin-Yi WangSupport optional feature: bypass GPIO.
Some SoC (eg. mt8173) have a hardware mux that connects to 2 ports:
anx7688 and hdmi. When the GPIO is active, the bridge is bypassed.
--- .../bindings/display/bridge/anx7688.txt | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/display/bridge/anx7688.txt +39 -1
@@ -15,10 +15,13 @@ Required properties: Optional properties: - Video port for HDMI input, using the DT bindings defined in [1]. + - bypass-gpios : External GPIO. If this GPIO is active, we assume + the bridge is bypassed (e.g. by a mux). + - pinctrl-0, pinctrl-names: the pincontrol settings to configure bypass GPIO. [1]: Documentation/devicetree/bindings/media/video-interfaces.txt -Example: +Example 1: anx7688: anx7688@2c { compatible = "analogix,anx7688";
@@ -30,3 +33,38 @@ Example: }; }; }; + +Example 2: + + anx7688: anx7688@2c { + compatible = "analogix,anx7688"; + status = "okay"; + reg = <0x2c>; + ddc-i2c-bus = <&hdmiddc0>; + + bypass-gpios = <&pio 36 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_mux_pins>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { /* input */ + reg = <0>; + + anx7688_in: endpoint { + remote-endpoint = <&hdmi_out_anx>; + }; + }; + + port@1 { /* output */ + reg = <1>; + + anx7688_out: endpoint { + remote-endpoint = <&hdmi_connector_in>; + }; + }; + }; + }; +
Signature · 1 line
2.24.0.393.g34dc348eaf-goog
Laurent Pinchart
reviewerRe: [PATCH RESEND 3/4] dt-bindings: drm/bridge: analogix-anx78xx: support bypass GPIO
Hi Hsin-Yi,
Thank you for the patch.
Quoted 4 lines · Hsin-Yi Wang
Support optional feature: bypass GPIO.
Some SoC (eg. mt8173) have a hardware mux that connects to 2 ports:
anx7688 and hdmi. When the GPIO is active, the bridge is bypassed.
This doesn't look like the right place to fix this, as the mux is unrelated to the bridge. You would have to duplicate this logic in every bridge driver otherwise.
Could you describe the hardware topology in a bit more details ? I can then try to advise on how to best support it.
Quoted 63 lines
Signed-off-by Hsin-Yi Wang <[email protected]>--- .../bindings/display/bridge/anx7688.txt | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/display/bridge/anx7688.txt +39
-1@@ -15,10 +15,13 @@ Required properties: Optional properties: - Video port for HDMI input, using the DT bindings defined in [1]. + - bypass-gpios : External GPIO. If this GPIO is active, we assume + the bridge is bypassed (e.g. by a mux). + - pinctrl-0, pinctrl-names: the pincontrol settings to configure bypass GPIO. [1]: Documentation/devicetree/bindings/media/video-interfaces.txt -Example: +Example 1: anx7688: anx7688@2c { compatible = "analogix,anx7688";@@ -30,3 +33,38 @@ Example: }; }; }; + +Example 2: + + anx7688: anx7688@2c { + compatible = "analogix,anx7688"; + status = "okay"; + reg = <0x2c>; + ddc-i2c-bus = <&hdmiddc0>; + + bypass-gpios = <&pio 36 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_mux_pins>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { /* input */ + reg = <0>; + + anx7688_in: endpoint { + remote-endpoint = <&hdmi_out_anx>; + }; + }; + + port@1 { /* output */ + reg = <1>; + + anx7688_out: endpoint { + remote-endpoint = <&hdmi_connector_in>; + }; + }; + }; + }; +
Signature · 7 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH RESEND 3/4] dt-bindings: drm/bridge: analogix-anx78xx: support bypass GPIO
Quoted 11 lines · Laurent Pinchart
Hi Hsin-Yi,
Thank you for the patch.
Quoted 4 lines · Hsin-Yi Wang
Support optional feature: bypass GPIO.
Some SoC (eg. mt8173) have a hardware mux that connects to 2 ports:
anx7688 and hdmi. When the GPIO is active, the bridge is bypassed.
Quoted 7 lines
This doesn't look like the right place to fix this, as the mux is unrelated to the bridge. You would have to duplicate this logic in every bridge driver otherwise.
Could you describe the hardware topology in a bit more details ? I can then try to advise on how to best support it.
Hi Laurent,
The mt8173 layout is:
MT8173 HDMI bridge-- hardware mux --- HDMI
|
------------ anx7688There's a hardware mux that takes mt8173 hdmi as input and has 2 output port: native hdmi and anx7688 bridge.
If gpio is active, we would like it to go to HDMI.
Previous approach is to make hardware mux a generic gpio mux bridge, but this is probably a very rare use case that is only for mt8173.(https://lore.kernel.org/lkml/[email protected]/) We merge the mux and anx7688 to a single bridge and leave this as an optional feature in this time.
Thanks.
Laurent Pinchart
reviewerRe: [PATCH RESEND 3/4] dt-bindings: drm/bridge: analogix-anx78xx: support bypass GPIO
Hi Hsin-Yi,
Quoted 14 lines · Hsin-Yi Wang
Quoted 6 lines · Laurent Pinchart
Quoted 4 lines · Hsin-Yi Wang
Support optional feature: bypass GPIO.
Some SoC (eg. mt8173) have a hardware mux that connects to 2 ports:
anx7688 and hdmi. When the GPIO is active, the bridge is bypassed.Quoted 6 lines
This doesn't look like the right place to fix this, as the mux is unrelated to the bridge. You would have to duplicate this logic in every bridge driver otherwise.
Could you describe the hardware topology in a bit more details ? I can then try to advise on how to best support it.
Quoted 7 lines
Hi Laurent,
The mt8173 layout is:
MT8173 HDMI bridge-- hardware mux --- HDMI
| ------------ anx7688
You may have used a proportional font when writing this, the | doesn't align with anything using a fixed font. Do I assume correctly that the hardware multiplexer is actually a demultiplexer with one input and two outputs ?
+-----------+
+---------+ +------+ /--> | HDMI |
| MT8173 | HDMI | -->| --/ | Connector |
| HDMI | ------> |--/ | +-----------+
| Encoder | | ->| --\ +-----------+ +-----------+
+---------+ +------+ \--> | ANX7688 | ---> | USB-C |
| Bridge | | Connector |
+-----------+ +-----------+Quoted 9 lines
There's a hardware mux that takes mt8173 hdmi as input and has 2 output port: native hdmi and anx7688 bridge.
If gpio is active, we would like it to go to HDMI.Previous approach is to make hardware mux a generic gpio mux bridge, but this is probably a very rare use case that is only for mt8173.(https://lore.kernel.org/lkml/[email protected]/) We merge the mux and anx7688 to a single bridge and leave this as an optional feature in this time.
I think that's a better approach, at least at the DT level. The HDMI demultiplexer should be represented as a DT node with 3 ports (one input and two outputs) with a control GPIO.
From a video point of view, the ANX7688 should be represented as a DT node with 2 ports (one input and one output), regardless of whether it is used in conjunction with an HDMI switch as shown above, or directly connected to the output of an HDMI encoder. However, as the ANX7688 supports both DP output and USB-C output, the situation may be slightly more complex. Please see https://patchwork.kernel.org/patch/11184895/
for a similar discussion, related to the ANX7625.
In any case, I don't think the ANX7688 should care about the GPIO.
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCH RESEND 3/4] dt-bindings: drm/bridge: analogix-anx78xx: support bypass GPIO
Quoted 1 line · Laurent Pinchart
Hi Laurent,
Quoted 4 lines
You may have used a proportional font when writing this, the | doesn't align with anything using a fixed font. Do I assume correctly that the hardware multiplexer is actually a demultiplexer with one input and two outputs ?
Quoted 9 lines
+-----------+
+---------+ +------+ /--> | HDMI |
| MT8173 | HDMI | -->| --/ | Connector |
| HDMI | ------> |--/ | +-----------+
| Encoder | | ->| --\ +-----------+ +-----------+
+---------+ +------+ \--> | ANX7688 | ---> | USB-C |
| Bridge | | Connector |
+-----------+ +-----------+Sorry for not noticing the font issue, this graph is correct.
Quoted 10 lines
Quoted 9 lines
There's a hardware mux that takes mt8173 hdmi as input and has 2 output port: native hdmi and anx7688 bridge.
If gpio is active, we would like it to go to HDMI.Previous approach is to make hardware mux a generic gpio mux bridge, but this is probably a very rare use case that is only for mt8173.(https://lore.kernel.org/lkml/[email protected]/) We merge the mux and anx7688 to a single bridge and leave this as an optional feature in this time.
Quoted 4 lines
I think that's a better approach, at least at the DT level. The HDMI demultiplexer should be represented as a DT node with 3 ports (one input and two outputs) with a control GPIO.
I've resend the original gpio mux driver. So for anx7688 there's 1 input and 1 output.
Thanks
PATCH RESEND 4/4 drm: bridge: anx7688: Support bypass GPIO feature
In reply to Hsin-Yi WangSupport optional feature: bypass GPIO.
Get GPIO status in irq handler. If GPIO is active, mode_fixup would be bypassed.
--- drivers/gpu/drm/bridge/analogix-anx7688.c | 57 +++++++++++++++++++++++ 1 file changed, 57 insertions(+)
drivers/gpu/drm/bridge/analogix-anx7688.c +57 -0
@@ -5,11 +5,16 @@* Copyright 2016 Google LLC */ +#include <linux/gpio.h> #include <linux/i2c.h> +#include <linux/interrupt.h> #include <linux/module.h> +#include <linux/of_gpio.h> #include <linux/regmap.h> #include <drm/drm_bridge.h> #include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_probe_helper.h> /* Register addresses */ #define VENDOR_ID_REG 0x00
@@ -31,6 +36,9 @@ struct anx7688 {struct i2c_client *client;struct regmap *regmap; +struct gpio_desc *gpiod_bypass; +int bypass; +bool filter; };
@@ -49,6 +57,10 @@ static bool anx7688_bridge_mode_fixup(struct drm_bridge *bridge,int totalbw, requiredbw;int ret; +/* bypass anx mode fixup */ +if (anx7688->bypass) +return true; +if (!anx7688->filter)return true;
@@ -93,6 +105,19 @@ static const struct drm_bridge_funcs anx7688_bridge_funcs = { .mode_fixup = anx7688_bridge_mode_fixup, }; +static irqreturn_t gpio_display_mux_det_threaded_handler (int unused,void *data) +{ +struct anx7688 *anx7688 = data; + + anx7688->bypass =gpiod_get_value (anx7688->gpiod_bypass); +dev_dbg (&anx7688->client->dev,"Interrupt %d!\n" , anx7688->bypass); + +if (anx7688->bridge.dev) +drm_kms_helper_hotplug_event (anx7688->bridge.dev); + +return IRQ_HANDLED ; +} +static const struct regmap_config anx7688_regmap_config = { .reg_bits =8 , .val_bits =8 ,
@@ -156,6 +181,38 @@ static int anx7688_i2c_probe(struct i2c_client *client, buffer[0], buffer[1]); } +/* Optional bypass-gpios */ + anx7688->gpiod_bypass =devm_gpiod_get_optional (dev,"bypass" , +GPIOD_IN ); +if (IS_ERR (anx7688->gpiod_bypass)) { + ret =PTR_ERR (anx7688->gpiod_bypass); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"bypass-gpios assigned failed\n" ); +return ret; + } +if (anx7688->gpiod_bypass) { +int irq; + + irq =gpiod_to_irq (anx7688->gpiod_bypass); +if (irq <0 ) { +dev_err (dev,"Failed to get output irq %d\n" , irq); +return -ENODEV ; + } + + anx7688->bypass =gpiod_get_value (anx7688->gpiod_bypass); + + ret =devm_request_threaded_irq (dev, irq,NULL , + gpio_display_mux_det_threaded_handler, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING | +IRQF_ONESHOT , +"gpio-display-mux-det" , anx7688); +if (ret) { +dev_err (dev, +"Failed to request MUX_DET threaded irq\n" ); +return ret; + } + } + anx7688->bridge.funcs = &anx7688_bridge_funcs;drm_bridge_add (&anx7688->bridge);
Signature · 1 line
2.24.0.393.g34dc348eaf-goog