Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1741981

[PATCH v3 03/14] drm/sun4i: tcon: Add variant callback for TCON output muxing

Show all headers | View raw

Different SoCs have different muxing options and values for the TCON
outputs. Instead of stuffing every possibility in sun4i_tcon_set_mux(),
add a callback pointer to sun4i_tcon_quirks that each TCON variant
can use to provide muxing support.

The current muxing options in sun4i_tcon_set_mux() for sun5i-a13 are
moved to a new sun5i-specific callback function.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/gpu/drm/sun4i/sun4i_tcon.c | 45 ++++++++++++++++++++++++--------------
 drivers/gpu/drm/sun4i/sun4i_tcon.h |  5 +++++
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
index e853dfe51389..7bf51abaee97 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -14,9 +14,12 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_encoder.h>
 #include <drm/drm_modes.h>
 #include <drm/drm_of.h>
 
+#include <uapi/drm/drm_mode.h>
+
 #include <linux/component.h>
 #include <linux/ioport.h>
 #include <linux/of_address.h>
@@ -112,23 +115,13 @@ EXPORT_SYMBOL(sun4i_tcon_enable_vblank);
 void sun4i_tcon_set_mux(struct sun4i_tcon *tcon, int channel,
 			struct drm_encoder *encoder)
 {
-	u32 val;
-
-	if (!tcon->quirks->has_unknown_mux)
-		return;
+	int ret = -ENOTSUPP;
 
-	if (channel != 1)
-		return;
-
-	if (encoder->encoder_type == DRM_MODE_ENCODER_TVDAC)
-		val = 1;
-	else
-		val = 0;
+	if (tcon->quirks->set_mux)
+		ret = tcon->quirks->set_mux(tcon, encoder);
 
-	/*
-	 * FIXME: Undocumented bits
-	 */
-	regmap_write(tcon->regs, SUN4I_TCON_MUX_CTRL_REG, val);
+	DRM_DEBUG_DRIVER("Muxing encoder %s to CRTC %s: %d\n",
+			 encoder->name, encoder->crtc->name, ret);
 }
 EXPORT_SYMBOL(sun4i_tcon_set_mux);
 
@@ -767,9 +760,27 @@ static int sun4i_tcon_remove(struct platform_device *pdev)
 	return 0;
 }
 
+/* platform specific TCON muxing callbacks */
+static int sun5i_a13_tcon_set_mux(struct sun4i_tcon *tcon,
+				  struct drm_encoder *encoder)
+{
+	u32 val;
+
+	if (encoder->encoder_type == DRM_MODE_ENCODER_TVDAC)
+		val = 1;
+	else
+		val = 0;
+
+	/*
+	 * FIXME: Undocumented bits
+	 */
+	return regmap_write(tcon->regs, SUN4I_TCON_MUX_CTRL_REG, val);
+}
+
 static const struct sun4i_tcon_quirks sun5i_a13_quirks = {
-	.has_unknown_mux = true,
-	.has_channel_1	= true,
+	.has_unknown_mux	= true,
+	.has_channel_1		= true,
+	.set_mux		= sun5i_a13_tcon_set_mux,
 };
 
 static const struct sun4i_tcon_quirks sun6i_a31_quirks = {
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h
index 5a219d1ccc26..6e699cbcf768 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.h
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h
@@ -145,10 +145,15 @@
 
 #define SUN4I_TCON_MAX_CHANNELS		2
 
+struct sun4i_tcon;
+
 struct sun4i_tcon_quirks {
 	bool	has_unknown_mux; /* sun5i has undocumented mux */
 	bool	has_channel_1;	/* a33 does not have channel 1 */
 	bool	needs_de_be_mux; /* sun6i needs mux to select backend */
+
+	/* callback to handle tcon muxing options */
+	int	(*set_mux)(struct sun4i_tcon *, struct drm_encoder *);
 };
 
 struct sun4i_tcon {
-- 
2.14.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 00/14] drm/sun4i: hdmi: Support HDMI controller on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 11/14] drm/sun4i: hdmi: Add A31 specific DDC register definitions Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 06/14] drm/sun4i: hdmi: create a regmap for later use Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 10/14] drm/sun4i: hdmi: Add support for controller hardware variants Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 07/14] drm/sun4i: hdmi: Allow using second PLL as TMDS clk parent Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 05/14] drm/sun4i: hdmi: Disable clks in bind function error path and unbind function Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 03/14] drm/sun4i: tcon: Add variant callback for TCON output muxing Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
    Re: [PATCH v3 03/14] drm/sun4i: tcon: Add variant callback for TCON  output muxing Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-29 12:20 +0200
      Re: [PATCH v3 03/14] drm/sun4i: tcon: Add variant callback for TCON  output muxing Chen-Yu Tsai <wens@csie.org> - 2017-10-02 15:10 +0200
  [PATCH v3 14/14] ARM: dts: sun6i: Enable HDMI support on some A31/A31s devices Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
  [PATCH v3 04/14] drm/sun4i: tcon: Add support for demuxing TCON output on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-29 10:30 +0200
    Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support for demuxing TCON  output on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-29 12:30 +0200
      Re: [linux-sunxi] Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support  for demuxing TCON output on A31 Julian Calaby <julian.calaby@gmail.com> - 2017-09-30 07:40 +0200
        Re: [linux-sunxi] Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support  for demuxing TCON output on A31 Chen-Yu Tsai <wens@csie.org> - 2017-09-30 08:00 +0200
          Re: [linux-sunxi] Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support  for demuxing TCON output on A31 Julian Calaby <julian.calaby@gmail.com> - 2017-09-30 08:30 +0200
            Re: [linux-sunxi] Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support  for demuxing TCON output on A31 Chen-Yu Tsai <wens@csie.org> - 2017-10-02 09:20 +0200
    Re: [PATCH v3 04/14] drm/sun4i: tcon: Add support for demuxing TCON  output on A31 Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-09-29 12:30 +0200

csiph-web