diff mbox series

[56/89] drm/vc4: crtc: Add HDMI1 encoder type

Message ID	bca207588770faae4db427c729bae8da3fd6e849.1582533919.git-series.maxime@cerno.tech (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=V2fm=4M=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97A1C20714 From: Maxime Ripard <maxime@cerno.tech> To: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, Eric Anholt <eric@anholt.net> Subject: [PATCH 56/89] drm/vc4: crtc: Add HDMI1 encoder type Date: Mon, 24 Feb 2020 10:06:58 +0100 Message-Id: <bca207588770faae4db427c729bae8da3fd6e849.1582533919.git-series.maxime@cerno.tech> In-Reply-To: <cover.6c896ace9a5a7840e9cec008b553cbb004ca1f91.1582533919.git-series.maxime@cerno.tech> References: <cover.6c896ace9a5a7840e9cec008b553cbb004ca1f91.1582533919.git-series.maxime@cerno.tech> MIME-Version: 1.0 summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [64.147.123.17 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Precedence: list Cc: Tim Gover <tim.gover@raspberrypi.com>, Dave Stevenson <dave.stevenson@raspberrypi.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Phil Elwell <phil@raspberrypi.com>, linux-arm-kernel@lists.infradead.org, Maxime Ripard <maxime@cerno.tech> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
Series	drm/vc4: Support BCM2711 Display Pipeline \| expand [00/89] drm/vc4: Support BCM2711 Display Pipeline [01/89] dt-bindings: i2c: brcmstb: Convert the BRCMSTB binding to a schema [02/89] dt-bindings: i2c: brcmstb: Add BCM2711 BSC/AUTO-I2C binding [03/89] i2c: brcmstb: Support BCM2711 HDMI BSC controllers [04/89] i2c: brcmstb: Allow to compile it on BCM2835 [05/89] clk: Return error code when of provider pointer is NULL [06/89] dt-bindings: clock: Add a binding for the RPi Firmware clocks [07/89] clk: bcm: rpi: Allow the driver to be probed by DT [08/89] clk: bcm: rpi: Statically init clk_init_data [09/89] clk: bcm: rpi: Use clk_hw_register for pllb_arm [10/89] clk: bcm: rpi: Remove global pllb_arm clock pointer [11/89] clk: bcm: rpi: Make sure pllb_arm is removed [12/89] clk: bcm: rpi: Remove pllb_arm_lookup global pointer [13/89] clk: bcm: rpi: Switch to clk_hw_register_clkdev [14/89] clk: bcm: rpi: Make sure the clkdev lookup is removed [15/89] clk: bcm: rpi: Create a data structure for the clocks [16/89] clk: bcm: rpi: Add clock id to data [17/89] clk: bcm: rpi: Pass the clocks data to the firmware function [18/89] clk: bcm: rpi: Rename is_prepared function [19/89] clk: bcm: rpi: Split pllb clock hooks [20/89] clk: bcm: rpi: Make the PLLB registration function return a clk_hw [21/89] clk: bcm: rpi: Add DT provider for the clocks [22/89] clk: bcm: rpi: Discover the firmware clocks [23/89] ARM: dts: bcm2711: Add firmware clocks node [24/89] reset: Move reset-simple header out of drivers/reset [25/89] reset: simple: Add reset callback [26/89] dt-bindings: clock: Add BCM2711 DVP binding [27/89] clk: bcm: Add BCM2711 DVP driver [28/89] ARM: dts: bcm2711: Add HDMI DVP [29/89] dt-bindings: display: Convert VC4 bindings to schemas [30/89] dt-bindings: display: vc4: dpi: Add missing clock-names property [31/89] dt-bindings: display: vc4: dsi: Add missing clock properties [32/89] dt-bindings: display: vc4: hdmi: Add missing clock-names property [33/89] dt-bindings: display: vc4: Document BCM2711 VC5 [34/89] drm/vc4: drv: Add include guards [35/89] drm/vc4: drv: Support BCM2711 [36/89] drm/vc4: drv: Add support for the BCM2711 HVS5 [37/89] drm/vc4: plane: Improve LBM usage [38/89] drm/vc4: plane: Move planes creation to its own function [39/89] drm/vc4: plane: Move additional planes creation to driver [40/89] drm/vc4: plane: Register all the planes at once [41/89] drm/vc4: plane: Create overlays for any CRTC [42/89] drm/vc4: plane: Create more planes [43/89] drm/vc4: crtc: Rename SoC data structures [44/89] drm/vc4: crtc: Move crtc state to common header [45/89] drm/vc4: crtc: Deal with different number of pixel per clock [46/89] drm/vc4: crtc: Use a shared interrupt [47/89] drm/vc4: crtc: Turn static const variable into a define [48/89] drm/vc4: crtc: Move the cob allocation outside of bind [49/89] drm/vc4: crtc: Rename HVS channel to output [50/89] drm/vc4: crtc: Use local chan variable [51/89] drm/vc4: crtc: Enable and disable the PV in atomic_enable / disable [52/89] drm/vc4: crtc: Assign output to channel automatically [53/89] drm/vc4: crtc: Add FIFO depth to vc4_crtc_data [54/89] drm/vc4: crtc: Add function to compute FIFO level bits [55/89] drm/vc4: crtc: Rename HDMI encoder type to HDMI0 [56/89] drm/vc4: crtc: Add HDMI1 encoder type [57/89] drm/vc4: crtc: Remove redundant call to drm_crtc_enable_color_mgmt [58/89] drm/vc4: crtc: Disable color management for HVS5 [59/89] dt-bindings: display: vc4: pv: Add BCM2711 pixel valves [60/89] drm/vc4: crtc: Add BCM2711 pixelvalves [61/89] drm/vc4: hdmi: Use debugfs private field [62/89] drm/vc4: hdmi: Move structure to header [63/89] drm/vc4: hdmi: rework connectors and encoders [64/89] drm/vc4: hdmi: Remove DDC argument to connector_init [65/89] drm/vc4: hdmi: Rename hdmi to vc4_hdmi [66/89] drm/vc4: hdmi: Move accessors to vc4_hdmi [67/89] drm/vc4: hdmi: Use local vc4_hdmi directly [68/89] drm/vc4: hdmi: Add container_of macros for encoders and connectors [69/89] drm/vc4: hdmi: Pass vc4_hdmi to CEC code [70/89] drm/vc4: hdmi: Remove vc4_dev hdmi pointer [71/89] drm/vc4: hdmi: Remove vc4_hdmi_connector [72/89] drm/vc4: hdmi: Introduce resource init and variant [73/89] drm/vc4: hdmi: Implement a register layout abstraction [74/89] drm/vc4: hdmi: Add reset callback [75/89] drm/vc4: hdmi: Add PHY init and disable function [76/89] drm/vc4: hdmi: Add PHY RNG enable / disable function [77/89] drm/vc4: hdmi: Add a CSC setup callback [78/89] drm/vc4: hdmi: Add a set_timings callback [79/89] drm/vc4: hdmi: Add HDMI ID [80/89] drm/vc4: hdmi: Deal with multiple debugfs files [81/89] drm/vc4: hdmi: Add an audio support flag [82/89] drm/vc4: hdmi: Move CEC init to its own function [83/89] drm/vc4: hdmi: Add CEC support flag [84/89] drm/vc4: hdmi: Remove unused CEC_CLOCK_DIV define [85/89] drm/vc4: hdmi: Rename drm_encoder pointer in mode_valid [86/89] drm/vc4: hdmi: Adjust HSM clock rate depending on pixel rate [87/89] drm/vc4: hdmi: Support the BCM2711 HDMI controllers [88/89] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI controllers bindings [89/89] ARM: dts: bcm2711: Enable the display pipeline

Commit Message

Maxime Ripard Feb. 24, 2020, 9:06 a.m. UTC

The BCM2711 sports a second HDMI controller, so let's add that second HDMI
encoder type.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 drivers/gpu/drm/vc4/vc4_drv.h | 1 +
 1 file changed, 1 insertion(+)

diff mbox series

Patch

diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index c262c7a388a4..1e44a3a8c2b0 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -428,6 +428,7 @@  to_vc4_plane_state(struct drm_plane_state *state)
 enum vc4_encoder_type {
 	VC4_ENCODER_TYPE_NONE,
 	VC4_ENCODER_TYPE_HDMI0,
+	VC4_ENCODER_TYPE_HDMI1,
 	VC4_ENCODER_TYPE_VEC,
 	VC4_ENCODER_TYPE_DSI0,
 	VC4_ENCODER_TYPE_DSI1,