dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Russell King <rmk+kernel@arm.linux.org.uk>
To: linux-arm-kernel@lists.infradead.org
Cc: Jason Cooper <jason@lakedaemon.net>,
	David Airlie <airlied@linux.ie>,
	dri-devel@lists.freedesktop.org, Rob Clark <robdclark@gmail.com>,
	Darren Etheridge <darren.etheridge@gmail.com>,
	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Subject: [RFC 5/8] drm/i2c: nxp-tda998x: prepare for video input configuration
Date: Thu, 16 May 2013 20:26:58 +0100	[thread overview]
Message-ID: <E1Ud3pK-0001qv-D7@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20130516192510.GV18614@n2100.arm.linux.org.uk>

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 drivers/gpu/drm/i2c/tda998x_drv.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index da2917b..d6afd02 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -32,6 +32,9 @@ struct tda998x_priv {
 	uint16_t rev;
 	uint8_t current_page;
 	int dpms;
+	u8 vip_cntrl_0;
+	u8 vip_cntrl_1;
+	u8 vip_cntrl_2;
 };
 
 #define to_tda998x_priv(x)  ((struct tda998x_priv *)to_encoder_slave(x)->slave_priv)
@@ -447,12 +450,9 @@ tda998x_encoder_dpms(struct drm_encoder *encoder, int mode)
 		reg_write(encoder, REG_ENA_VP_1, 0xff);
 		reg_write(encoder, REG_ENA_VP_2, 0xff);
 		/* set muxing after enabling ports: */
-		reg_write(encoder, REG_VIP_CNTRL_0,
-				VIP_CNTRL_0_SWAP_A(2) | VIP_CNTRL_0_SWAP_B(3));
-		reg_write(encoder, REG_VIP_CNTRL_1,
-				VIP_CNTRL_1_SWAP_C(0) | VIP_CNTRL_1_SWAP_D(1));
-		reg_write(encoder, REG_VIP_CNTRL_2,
-				VIP_CNTRL_2_SWAP_E(4) | VIP_CNTRL_2_SWAP_F(5));
+		reg_write(encoder, REG_VIP_CNTRL_0, priv->vip_cntrl_0);
+		reg_write(encoder, REG_VIP_CNTRL_1, priv->vip_cntrl_1);
+		reg_write(encoder, REG_VIP_CNTRL_2, priv->vip_cntrl_2);
 		break;
 	case DRM_MODE_DPMS_OFF:
 		/* disable audio and video ports */
@@ -822,6 +822,10 @@ tda998x_encoder_init(struct i2c_client *client,
 	if (!priv)
 		return -ENOMEM;
 
+	priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(2) | VIP_CNTRL_0_SWAP_B(3);
+	priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(0) | VIP_CNTRL_1_SWAP_D(1);
+	priv->vip_cntrl_2 = VIP_CNTRL_2_SWAP_E(4) | VIP_CNTRL_2_SWAP_F(5);
+
 	priv->current_page = 0;
 	priv->cec = i2c_new_dummy(client->adapter, 0x34);
 	priv->dpms = DRM_MODE_DPMS_OFF;
-- 
1.7.4.4

  parent reply	other threads:[~2013-05-16 19:26 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-16 19:25 [RFC 0/8] rmk's Dove DRM/TDA19988 Cubox driver Russell King - ARM Linux
2013-05-16 19:25 ` [RFC 1/8] DRM: Add Dove DRM driver Russell King
2013-05-16 19:25 ` [RFC 2/8] drm/i2c: nxp-tda998x: fix EDID reading on TDA19988 devices Russell King
2013-05-16 19:26 ` [RFC 3/8] drm/i2c: nxp-tda998x: ensure VIP output mux is properly set Russell King
2013-05-18  6:56   ` Jean-Francois Moine
2013-05-19 10:30     ` Russell King - ARM Linux
2013-05-16 19:26 ` [RFC 4/8] drm/i2c: nxp-tda998x: fix npix/nline programming Russell King
2013-05-16 19:26 ` Russell King [this message]
2013-05-16 19:27 ` [RFC 6/8] drm/i2c: nxp-tda998x: add video and audio input configuration Russell King
2013-05-22 21:08   ` Rob Clark
2013-05-16 19:27 ` [RFC 7/8] DRM: Dove: add support for drm tda19988 driver Russell King
2013-05-16 19:27 ` [RFC 8/8] DRM: dove: provide a couple of generic slave encoder helpers Russell King
2013-05-17 11:33 ` [RFC 0/8] rmk's Dove DRM/TDA19988 Cubox driver Jean-Francois Moine
2013-05-17 11:58   ` Sebastian Hesselbarth
2013-05-17 12:01   ` Russell King - ARM Linux
2013-05-17 17:40     ` Jean-Francois Moine
2013-05-17 18:00       ` Russell King - ARM Linux
2013-05-17 18:05         ` Russell King - ARM Linux
2013-05-17 18:57         ` Jean-Francois Moine
2013-05-19  8:59       ` Russell King - ARM Linux
2013-05-20 13:36         ` Alex Deucher
2013-05-20 20:15           ` Russell King - ARM Linux
2013-05-20 20:23             ` Alex Deucher
2013-05-21  6:30               ` Jean-Francois Moine
2013-05-19 11:25   ` Russell King - ARM Linux
2013-05-18 17:12 ` [RFC 0/4] Add DT support to rmk's Dove DRM driver Sebastian Hesselbarth
2013-05-18 17:12   ` [RFC 1/4] ARM: dove: add lcd controller DT nodes Sebastian Hesselbarth
2013-05-18 17:12   ` [RFC 2/4] ARM: dove: add video card node for SolidRun CuBox Sebastian Hesselbarth
2013-05-18 17:33     ` Jean-Francois Moine
2013-05-18 18:33       ` Sebastian Hesselbarth
2013-05-18 17:12   ` [RFC 3/4] DRM: add OF support for Dove DRM driver Sebastian Hesselbarth
2013-05-18 17:45     ` Jean-Francois Moine
2013-05-18 18:20       ` Sebastian Hesselbarth
2013-05-18 19:18         ` Jean-Francois Moine
2013-05-20 10:16           ` Russell King - ARM Linux
2013-05-18 20:46       ` Russell King - ARM Linux
2013-05-18 17:12   ` [RFC 4/4] DRM: tda998x: add missing include Sebastian Hesselbarth
2013-05-18 17:46     ` Jean-Francois Moine
2013-05-18 18:21       ` Sebastian Hesselbarth
2013-05-18 18:23       ` Rob Clark
2013-05-18 18:58         ` Jean-Francois Moine
2013-05-18 19:11           ` Rob Clark
2013-05-18 19:30           ` Sebastian Hesselbarth
2013-05-18 20:26             ` Russell King - ARM Linux
2013-05-18 20:50               ` Sebastian Hesselbarth
2013-05-19  6:01             ` Jean-Francois Moine
2013-05-19  8:30               ` Sebastian Hesselbarth
2013-05-19 16:49                 ` Jean-Francois Moine

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=E1Ud3pK-0001qv-D7@rmk-PC.arm.linux.org.uk \
    --to=rmk+kernel@arm.linux.org.uk \
    --cc=airlied@linux.ie \
    --cc=darren.etheridge@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=robdclark@gmail.com \
    --cc=sebastian.hesselbarth@gmail.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