From: Maxime Ripard <maxime@cerno.tech>
To: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Eric Anholt <eric@anholt.net>
Cc: dri-devel@lists.freedesktop.org,
linux-rpi-kernel@lists.infradead.org,
bcm-kernel-feedback-list@broadcom.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Tim Gover <tim.gover@raspberrypi.com>,
Phil Elwell <phil@raspberrypi.com>,
Maxime Ripard <maxime@cerno.tech>
Subject: [PATCH 76/89] drm/vc4: hdmi: Add PHY RNG enable / disable function
Date: Mon, 24 Feb 2020 10:07:18 +0100 [thread overview]
Message-ID: <a651c02df91d28f288259af4a17dcc289e10053c.1582533919.git-series.maxime@cerno.tech> (raw)
In-Reply-To: <cover.6c896ace9a5a7840e9cec008b553cbb004ca1f91.1582533919.git-series.maxime@cerno.tech>
Let's continue the implementation of hooks for the parts that change in the
BCM2711 SoC with the PHY RNG setup.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/vc4/vc4_hdmi.c | 15 +++++++++------
drivers/gpu/drm/vc4/vc4_hdmi.h | 8 ++++++++
drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 15 +++++++++++++++
3 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 14c5ce4e7010..50d69c74c5c4 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -752,9 +752,9 @@ static int vc4_hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd,
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
vc4_hdmi_set_audio_infoframe(encoder);
- HDMI_WRITE(HDMI_TX_PHY_CTL_0,
- HDMI_READ(HDMI_TX_PHY_CTL_0) &
- ~VC4_HDMI_TX_PHY_RNG_PWRDN);
+
+ if (vc4_hdmi->variant->phy_rng_enable)
+ vc4_hdmi->variant->phy_rng_enable(vc4_hdmi);
HDMI_WRITE(HDMI_MAI_CTL,
VC4_SET_FIELD(vc4_hdmi->audio.channels,
@@ -766,9 +766,10 @@ static int vc4_hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd,
VC4_HD_MAI_CTL_DLATE |
VC4_HD_MAI_CTL_ERRORE |
VC4_HD_MAI_CTL_ERRORF);
- HDMI_WRITE(HDMI_TX_PHY_CTL_0,
- HDMI_READ(HDMI_TX_PHY_CTL_0) |
- VC4_HDMI_TX_PHY_RNG_PWRDN);
+
+ if (vc4_hdmi->variant->phy_rng_disable)
+ vc4_hdmi->variant->phy_rng_disable(vc4_hdmi);
+
break;
default:
break;
@@ -1413,6 +1414,8 @@ struct vc4_hdmi_variant bcm2835_variant = {
.reset = vc4_hdmi_reset,
.phy_init = vc4_hdmi_phy_init,
.phy_disable = vc4_hdmi_phy_disable,
+ .phy_rng_enable = vc4_hdmi_phy_rng_enable,
+ .phy_rng_disable = vc4_hdmi_phy_rng_disable,
};
static const struct of_device_id vc4_hdmi_dt_match[] = {
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
index 39ae5273f36b..9ae4d2c5a4f0 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
@@ -47,6 +47,12 @@ struct vc4_hdmi_variant {
/* Callback to disable the PHY */
void (*phy_disable)(struct vc4_hdmi *vc4_hdmi);
+
+ /* Callback to enable the RNG in the PHY */
+ void (*phy_rng_enable)(struct vc4_hdmi *vc4_hdmi);
+
+ /* Callback to disable the RNG in the PHY */
+ void (*phy_rng_disable)(struct vc4_hdmi *vc4_hdmi);
};
/* HDMI audio information */
@@ -107,5 +113,7 @@ encoder_to_vc4_hdmi(struct drm_encoder *encoder)
void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi,
struct drm_display_mode *mode);
void vc4_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi);
+void vc4_hdmi_phy_rng_enable(struct vc4_hdmi *vc4_hdmi);
+void vc4_hdmi_phy_rng_disable(struct vc4_hdmi *vc4_hdmi);
#endif /* _VC4_HDMI_H_ */
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
index 26d6ee08edcf..8fdea621d8b1 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
@@ -7,6 +7,7 @@
*/
#include "vc4_hdmi.h"
+#include "vc4_regs.h"
#include "vc4_hdmi_regs.h"
void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi, struct drm_display_mode *mode)
@@ -23,3 +24,17 @@ void vc4_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi)
{
HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0xf << 16);
}
+
+void vc4_hdmi_phy_rng_enable(struct vc4_hdmi *vc4_hdmi)
+{
+ HDMI_WRITE(HDMI_TX_PHY_CTL_0,
+ HDMI_READ(HDMI_TX_PHY_CTL_0) &
+ ~VC4_HDMI_TX_PHY_RNG_PWRDN);
+}
+
+void vc4_hdmi_phy_rng_disable(struct vc4_hdmi *vc4_hdmi)
+{
+ HDMI_WRITE(HDMI_TX_PHY_CTL_0,
+ HDMI_READ(HDMI_TX_PHY_CTL_0) |
+ VC4_HDMI_TX_PHY_RNG_PWRDN);
+}
--
git-series 0.9.1
next prev parent reply other threads:[~2020-02-24 9:10 UTC|newest]
Thread overview: 161+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 9:06 [PATCH 00/89] drm/vc4: Support BCM2711 Display Pipeline Maxime Ripard
2020-02-24 9:06 ` [PATCH 01/89] dt-bindings: i2c: brcmstb: Convert the BRCMSTB binding to a schema Maxime Ripard
2020-02-24 17:40 ` Florian Fainelli
2020-02-25 18:14 ` Rob Herring
2020-03-10 10:07 ` Wolfram Sang
2020-03-10 10:07 ` Wolfram Sang
2020-02-24 9:06 ` [PATCH 02/89] dt-bindings: i2c: brcmstb: Add BCM2711 BSC/AUTO-I2C binding Maxime Ripard
2020-02-24 17:48 ` Florian Fainelli
2020-02-25 18:15 ` Rob Herring
2020-03-10 10:07 ` Wolfram Sang
2020-02-24 9:06 ` [PATCH 03/89] i2c: brcmstb: Support BCM2711 HDMI BSC controllers Maxime Ripard
2020-02-24 17:44 ` Florian Fainelli
2020-03-10 10:12 ` Wolfram Sang
2020-02-24 9:06 ` [PATCH 04/89] i2c: brcmstb: Allow to compile it on BCM2835 Maxime Ripard
2020-02-24 17:39 ` Florian Fainelli
2020-03-10 10:16 ` Wolfram Sang
2020-02-24 9:06 ` [PATCH 05/89] clk: Return error code when of provider pointer is NULL Maxime Ripard
2020-03-12 23:13 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 06/89] dt-bindings: clock: Add a binding for the RPi Firmware clocks Maxime Ripard
2020-02-25 18:16 ` Rob Herring
2020-03-12 23:14 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 07/89] clk: bcm: rpi: Allow the driver to be probed by DT Maxime Ripard
2020-02-25 16:00 ` Nicolas Saenz Julienne
2020-02-26 15:01 ` Maxime Ripard
2020-02-28 19:57 ` Nicolas Saenz Julienne
2020-03-01 12:16 ` Stefan Wahren
2020-03-23 15:13 ` Maxime Ripard
2020-02-24 9:06 ` [PATCH 08/89] clk: bcm: rpi: Statically init clk_init_data Maxime Ripard
2020-02-25 16:05 ` Nicolas Saenz Julienne
2020-02-24 9:06 ` [PATCH 09/89] clk: bcm: rpi: Use clk_hw_register for pllb_arm Maxime Ripard
2020-02-25 16:11 ` Nicolas Saenz Julienne
2020-03-12 23:17 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 10/89] clk: bcm: rpi: Remove global pllb_arm clock pointer Maxime Ripard
2020-02-25 16:13 ` Nicolas Saenz Julienne
2020-02-26 14:26 ` Maxime Ripard
2020-02-26 14:57 ` Nicolas Saenz Julienne
2020-02-24 9:06 ` [PATCH 11/89] clk: bcm: rpi: Make sure pllb_arm is removed Maxime Ripard
2020-02-25 16:14 ` Nicolas Saenz Julienne
2020-03-12 23:20 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 12/89] clk: bcm: rpi: Remove pllb_arm_lookup global pointer Maxime Ripard
2020-02-25 16:16 ` Nicolas Saenz Julienne
2020-03-12 23:21 ` Stephen Boyd
2020-03-13 1:13 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 13/89] clk: bcm: rpi: Switch to clk_hw_register_clkdev Maxime Ripard
2020-02-25 16:17 ` Nicolas Saenz Julienne
2020-03-13 1:12 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 14/89] clk: bcm: rpi: Make sure the clkdev lookup is removed Maxime Ripard
2020-02-25 16:19 ` Nicolas Saenz Julienne
2020-03-13 1:11 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 15/89] clk: bcm: rpi: Create a data structure for the clocks Maxime Ripard
2020-02-25 16:24 ` Nicolas Saenz Julienne
2020-03-13 1:11 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 16/89] clk: bcm: rpi: Add clock id to data Maxime Ripard
2020-02-24 19:25 ` Stefan Wahren
2020-02-25 9:54 ` Maxime Ripard
2020-02-25 14:33 ` Nicolas Saenz Julienne
2020-02-25 16:24 ` Nicolas Saenz Julienne
2020-03-13 1:11 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 17/89] clk: bcm: rpi: Pass the clocks data to the firmware function Maxime Ripard
2020-02-25 16:26 ` Nicolas Saenz Julienne
2020-03-13 1:09 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 18/89] clk: bcm: rpi: Rename is_prepared function Maxime Ripard
2020-02-25 16:45 ` Nicolas Saenz Julienne
2020-03-13 1:09 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 19/89] clk: bcm: rpi: Split pllb clock hooks Maxime Ripard
2020-03-13 1:08 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 20/89] clk: bcm: rpi: Make the PLLB registration function return a clk_hw Maxime Ripard
2020-03-13 1:01 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 21/89] clk: bcm: rpi: Add DT provider for the clocks Maxime Ripard
2020-03-13 1:01 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 22/89] clk: bcm: rpi: Discover the firmware clocks Maxime Ripard
2020-02-24 16:47 ` kbuild test robot
2020-02-24 16:47 ` [PATCH] clk: bcm: rpi: fix noderef.cocci warnings kbuild test robot
2020-02-24 18:15 ` [PATCH 22/89] clk: bcm: rpi: Discover the firmware clocks Florian Fainelli
2020-02-26 14:15 ` Maxime Ripard
2020-02-24 20:24 ` kbuild test robot
2020-03-13 1:08 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 23/89] ARM: dts: bcm2711: Add firmware clocks node Maxime Ripard
2020-02-24 9:06 ` [PATCH 24/89] reset: Move reset-simple header out of drivers/reset Maxime Ripard
2020-02-24 9:06 ` [PATCH 25/89] reset: simple: Add reset callback Maxime Ripard
2020-03-04 12:03 ` Philipp Zabel
2020-02-24 9:06 ` [PATCH 26/89] dt-bindings: clock: Add BCM2711 DVP binding Maxime Ripard
2020-02-25 18:17 ` Rob Herring
2020-02-24 9:06 ` [PATCH 27/89] clk: bcm: Add BCM2711 DVP driver Maxime Ripard
2020-03-13 1:00 ` Stephen Boyd
2020-03-23 10:56 ` Maxime Ripard
2020-03-25 2:20 ` Stephen Boyd
2020-02-24 9:06 ` [PATCH 28/89] ARM: dts: bcm2711: Add HDMI DVP Maxime Ripard
2020-02-24 9:06 ` [PATCH 29/89] dt-bindings: display: Convert VC4 bindings to schemas Maxime Ripard
2020-02-24 18:41 ` Rob Herring
2020-02-25 11:54 ` Maxime Ripard
2020-02-25 14:02 ` Rob Herring
2020-02-24 9:06 ` [PATCH 30/89] dt-bindings: display: vc4: dpi: Add missing clock-names property Maxime Ripard
2020-02-25 18:17 ` Rob Herring
2020-02-24 9:06 ` [PATCH 31/89] dt-bindings: display: vc4: dsi: Add missing clock properties Maxime Ripard
2020-02-25 18:18 ` Rob Herring
2020-02-24 9:06 ` [PATCH 32/89] dt-bindings: display: vc4: hdmi: Add missing clock-names property Maxime Ripard
2020-02-25 18:18 ` Rob Herring
2020-02-24 9:06 ` [PATCH 33/89] dt-bindings: display: vc4: Document BCM2711 VC5 Maxime Ripard
2020-02-25 18:18 ` Rob Herring
2020-02-24 9:06 ` [PATCH 34/89] drm/vc4: drv: Add include guards Maxime Ripard
2020-02-24 9:06 ` [PATCH 35/89] drm/vc4: drv: Support BCM2711 Maxime Ripard
2020-02-24 9:06 ` [PATCH 36/89] drm/vc4: drv: Add support for the BCM2711 HVS5 Maxime Ripard
2020-02-24 9:06 ` [PATCH 37/89] drm/vc4: plane: Improve LBM usage Maxime Ripard
2020-02-24 9:06 ` [PATCH 38/89] drm/vc4: plane: Move planes creation to its own function Maxime Ripard
2020-02-24 9:06 ` [PATCH 39/89] drm/vc4: plane: Move additional planes creation to driver Maxime Ripard
2020-02-24 9:06 ` [PATCH 40/89] drm/vc4: plane: Register all the planes at once Maxime Ripard
2020-02-24 9:06 ` [PATCH 41/89] drm/vc4: plane: Create overlays for any CRTC Maxime Ripard
2020-02-24 9:06 ` [PATCH 42/89] drm/vc4: plane: Create more planes Maxime Ripard
2020-02-24 9:06 ` [PATCH 43/89] drm/vc4: crtc: Rename SoC data structures Maxime Ripard
2020-02-24 9:06 ` [PATCH 44/89] drm/vc4: crtc: Move crtc state to common header Maxime Ripard
2020-02-24 9:06 ` [PATCH 45/89] drm/vc4: crtc: Deal with different number of pixel per clock Maxime Ripard
2020-02-24 9:06 ` [PATCH 46/89] drm/vc4: crtc: Use a shared interrupt Maxime Ripard
2020-02-24 9:06 ` [PATCH 47/89] drm/vc4: crtc: Turn static const variable into a define Maxime Ripard
2020-02-24 9:06 ` [PATCH 48/89] drm/vc4: crtc: Move the cob allocation outside of bind Maxime Ripard
2020-02-24 9:06 ` [PATCH 49/89] drm/vc4: crtc: Rename HVS channel to output Maxime Ripard
2020-02-24 9:06 ` [PATCH 50/89] drm/vc4: crtc: Use local chan variable Maxime Ripard
2020-02-24 9:06 ` [PATCH 51/89] drm/vc4: crtc: Enable and disable the PV in atomic_enable / disable Maxime Ripard
2020-02-24 9:06 ` [PATCH 52/89] drm/vc4: crtc: Assign output to channel automatically Maxime Ripard
2020-02-24 9:06 ` [PATCH 53/89] drm/vc4: crtc: Add FIFO depth to vc4_crtc_data Maxime Ripard
2020-02-24 9:06 ` [PATCH 54/89] drm/vc4: crtc: Add function to compute FIFO level bits Maxime Ripard
2020-02-24 9:06 ` [PATCH 55/89] drm/vc4: crtc: Rename HDMI encoder type to HDMI0 Maxime Ripard
2020-02-24 9:06 ` [PATCH 56/89] drm/vc4: crtc: Add HDMI1 encoder type Maxime Ripard
2020-02-24 9:06 ` [PATCH 57/89] drm/vc4: crtc: Remove redundant call to drm_crtc_enable_color_mgmt Maxime Ripard
2020-02-24 9:07 ` [PATCH 58/89] drm/vc4: crtc: Disable color management for HVS5 Maxime Ripard
2020-02-24 9:07 ` [PATCH 59/89] dt-bindings: display: vc4: pv: Add BCM2711 pixel valves Maxime Ripard
2020-02-25 18:19 ` Rob Herring
2020-02-24 9:07 ` [PATCH 60/89] drm/vc4: crtc: Add BCM2711 pixelvalves Maxime Ripard
2020-02-24 9:07 ` [PATCH 61/89] drm/vc4: hdmi: Use debugfs private field Maxime Ripard
2020-02-24 9:07 ` [PATCH 62/89] drm/vc4: hdmi: Move structure to header Maxime Ripard
2020-02-24 9:07 ` [PATCH 63/89] drm/vc4: hdmi: rework connectors and encoders Maxime Ripard
2020-02-24 9:07 ` [PATCH 64/89] drm/vc4: hdmi: Remove DDC argument to connector_init Maxime Ripard
2020-02-24 9:07 ` [PATCH 65/89] drm/vc4: hdmi: Rename hdmi to vc4_hdmi Maxime Ripard
2020-02-24 9:07 ` [PATCH 66/89] drm/vc4: hdmi: Move accessors " Maxime Ripard
2020-02-24 9:07 ` [PATCH 67/89] drm/vc4: hdmi: Use local vc4_hdmi directly Maxime Ripard
2020-02-24 9:07 ` [PATCH 68/89] drm/vc4: hdmi: Add container_of macros for encoders and connectors Maxime Ripard
2020-02-24 9:07 ` [PATCH 69/89] drm/vc4: hdmi: Pass vc4_hdmi to CEC code Maxime Ripard
2020-02-24 9:07 ` [PATCH 70/89] drm/vc4: hdmi: Remove vc4_dev hdmi pointer Maxime Ripard
2020-02-24 9:07 ` [PATCH 71/89] drm/vc4: hdmi: Remove vc4_hdmi_connector Maxime Ripard
2020-02-24 9:07 ` [PATCH 72/89] drm/vc4: hdmi: Introduce resource init and variant Maxime Ripard
2020-02-24 9:07 ` [PATCH 73/89] drm/vc4: hdmi: Implement a register layout abstraction Maxime Ripard
2020-02-24 9:07 ` [PATCH 74/89] drm/vc4: hdmi: Add reset callback Maxime Ripard
2020-02-24 9:07 ` [PATCH 75/89] drm/vc4: hdmi: Add PHY init and disable function Maxime Ripard
2020-02-24 9:07 ` Maxime Ripard [this message]
2020-02-24 9:07 ` [PATCH 77/89] drm/vc4: hdmi: Add a CSC setup callback Maxime Ripard
2020-02-24 9:07 ` [PATCH 78/89] drm/vc4: hdmi: Add a set_timings callback Maxime Ripard
2020-02-24 9:07 ` [PATCH 79/89] drm/vc4: hdmi: Add HDMI ID Maxime Ripard
2020-02-24 9:07 ` [PATCH 80/89] drm/vc4: hdmi: Deal with multiple debugfs files Maxime Ripard
2020-02-24 9:07 ` [PATCH 81/89] drm/vc4: hdmi: Add an audio support flag Maxime Ripard
2020-02-24 9:07 ` [PATCH 82/89] drm/vc4: hdmi: Move CEC init to its own function Maxime Ripard
2020-02-24 9:07 ` [PATCH 83/89] drm/vc4: hdmi: Add CEC support flag Maxime Ripard
2020-02-24 9:07 ` [PATCH 84/89] drm/vc4: hdmi: Remove unused CEC_CLOCK_DIV define Maxime Ripard
2020-02-24 9:07 ` [PATCH 85/89] drm/vc4: hdmi: Rename drm_encoder pointer in mode_valid Maxime Ripard
2020-02-24 9:07 ` [PATCH 86/89] drm/vc4: hdmi: Adjust HSM clock rate depending on pixel rate Maxime Ripard
2020-03-16 12:54 ` Nicolas Saenz Julienne
2020-02-24 9:07 ` [PATCH 87/89] drm/vc4: hdmi: Support the BCM2711 HDMI controllers Maxime Ripard
2020-03-17 18:25 ` Daniel Rodriguez
2020-02-24 9:07 ` [PATCH 88/89] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI controllers bindings Maxime Ripard
2020-02-25 18:24 ` Rob Herring
2020-02-24 9:07 ` [PATCH 89/89] ARM: dts: bcm2711: Enable the display pipeline Maxime Ripard
2020-03-05 10:00 ` [PATCH 70/89] drm/vc4: hdmi: Remove vc4_dev hdmi pointer Jian-Hong Pan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a651c02df91d28f288259af4a17dcc289e10053c.1582533919.git-series.maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=nsaenzjulienne@suse.de \
--cc=phil@raspberrypi.com \
--cc=tim.gover@raspberrypi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).