All of lore.kernel.org
 help / color / mirror / Atom feed
From: rmk+kernel@armlinux.org.uk (Russell King)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH RFC 12/12] drm/i2c: tda998x: switch to boolean is_on
Date: Tue, 08 Nov 2016 12:25:58 +0000	[thread overview]
Message-ID: <E1c45TS-0005kT-2y@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <20161108122420.GP1041@n2100.armlinux.org.uk>

Rather than storing the DPMS mode (which will always be on or off) use a
boolean to store this instead.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
 drivers/gpu/drm/i2c/tda998x_drv.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index 226871e34442..3a5e5c466972 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -42,7 +42,7 @@ struct tda998x_priv {
 	struct mutex mutex;
 	u16 rev;
 	u8 current_page;
-	int dpms;
+	bool is_on;
 	bool supports_infoframes;
 	bool sink_has_audio;
 	u8 vip_cntrl_0;
@@ -1159,16 +1159,15 @@ static int tda998x_connector_init(struct tda998x_priv *priv,
 static void tda998x_encoder_dpms(struct drm_encoder *encoder, int mode)
 {
 	struct tda998x_priv *priv = enc_to_tda998x_priv(encoder);
+	bool on;
 
 	/* we only care about on or off: */
-	if (mode != DRM_MODE_DPMS_ON)
-		mode = DRM_MODE_DPMS_OFF;
+	on = mode == DRM_MODE_DPMS_ON;
 
-	if (mode == priv->dpms)
+	if (on == priv->is_on)
 		return;
 
-	switch (mode) {
-	case DRM_MODE_DPMS_ON:
+	if (on) {
 		/* enable video ports, audio will be enabled later */
 		reg_write(priv, REG_ENA_VP_0, 0xff);
 		reg_write(priv, REG_ENA_VP_1, 0xff);
@@ -1177,16 +1176,16 @@ static void tda998x_encoder_dpms(struct drm_encoder *encoder, int mode)
 		reg_write(priv, REG_VIP_CNTRL_0, priv->vip_cntrl_0);
 		reg_write(priv, REG_VIP_CNTRL_1, priv->vip_cntrl_1);
 		reg_write(priv, REG_VIP_CNTRL_2, priv->vip_cntrl_2);
-		break;
-	case DRM_MODE_DPMS_OFF:
+
+		priv->is_on = true;
+	} else {
 		/* disable video ports */
 		reg_write(priv, REG_ENA_VP_0, 0x00);
 		reg_write(priv, REG_ENA_VP_1, 0x00);
 		reg_write(priv, REG_ENA_VP_2, 0x00);
-		break;
-	}
 
-	priv->dpms = mode;
+		priv->is_on = false;
+	}
 }
 
 static void
@@ -1480,8 +1479,6 @@ static int tda998x_create(struct i2c_client *client, struct tda998x_priv *priv)
 	if (!priv->cec)
 		return -ENODEV;
 
-	priv->dpms = DRM_MODE_DPMS_OFF;
-
 	mutex_init(&priv->mutex);	/* protect the page access */
 	init_waitqueue_head(&priv->edid_delay_waitq);
 	setup_timer(&priv->edid_delay_timer, tda998x_edid_delay_done,
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: Russell King <rmk+kernel@armlinux.org.uk>
To: Brian Starkey <brian.starkey@arm.com>,
	Liviu Dudau <Liviu.Dudau@arm.com>, Jyri Sarha <jsarha@ti.com>
Cc: linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org
Subject: [PATCH RFC 12/12] drm/i2c: tda998x: switch to boolean is_on
Date: Tue, 08 Nov 2016 12:25:58 +0000	[thread overview]
Message-ID: <E1c45TS-0005kT-2y@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <20161108122420.GP1041@n2100.armlinux.org.uk>

Rather than storing the DPMS mode (which will always be on or off) use a
boolean to store this instead.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
 drivers/gpu/drm/i2c/tda998x_drv.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index 226871e34442..3a5e5c466972 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -42,7 +42,7 @@ struct tda998x_priv {
 	struct mutex mutex;
 	u16 rev;
 	u8 current_page;
-	int dpms;
+	bool is_on;
 	bool supports_infoframes;
 	bool sink_has_audio;
 	u8 vip_cntrl_0;
@@ -1159,16 +1159,15 @@ static int tda998x_connector_init(struct tda998x_priv *priv,
 static void tda998x_encoder_dpms(struct drm_encoder *encoder, int mode)
 {
 	struct tda998x_priv *priv = enc_to_tda998x_priv(encoder);
+	bool on;
 
 	/* we only care about on or off: */
-	if (mode != DRM_MODE_DPMS_ON)
-		mode = DRM_MODE_DPMS_OFF;
+	on = mode == DRM_MODE_DPMS_ON;
 
-	if (mode == priv->dpms)
+	if (on == priv->is_on)
 		return;
 
-	switch (mode) {
-	case DRM_MODE_DPMS_ON:
+	if (on) {
 		/* enable video ports, audio will be enabled later */
 		reg_write(priv, REG_ENA_VP_0, 0xff);
 		reg_write(priv, REG_ENA_VP_1, 0xff);
@@ -1177,16 +1176,16 @@ static void tda998x_encoder_dpms(struct drm_encoder *encoder, int mode)
 		reg_write(priv, REG_VIP_CNTRL_0, priv->vip_cntrl_0);
 		reg_write(priv, REG_VIP_CNTRL_1, priv->vip_cntrl_1);
 		reg_write(priv, REG_VIP_CNTRL_2, priv->vip_cntrl_2);
-		break;
-	case DRM_MODE_DPMS_OFF:
+
+		priv->is_on = true;
+	} else {
 		/* disable video ports */
 		reg_write(priv, REG_ENA_VP_0, 0x00);
 		reg_write(priv, REG_ENA_VP_1, 0x00);
 		reg_write(priv, REG_ENA_VP_2, 0x00);
-		break;
-	}
 
-	priv->dpms = mode;
+		priv->is_on = false;
+	}
 }
 
 static void
@@ -1480,8 +1479,6 @@ static int tda998x_create(struct i2c_client *client, struct tda998x_priv *priv)
 	if (!priv->cec)
 		return -ENODEV;
 
-	priv->dpms = DRM_MODE_DPMS_OFF;
-
 	mutex_init(&priv->mutex);	/* protect the page access */
 	init_waitqueue_head(&priv->edid_delay_waitq);
 	setup_timer(&priv->edid_delay_timer, tda998x_edid_delay_done,
-- 
2.7.4

  parent reply	other threads:[~2016-11-08 12:25 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-08 12:24 [PATCH RFC 00/12] tda998x updates Russell King - ARM Linux
2016-11-08 12:24 ` Russell King - ARM Linux
2016-11-08 12:25 ` [PATCH RFC 01/12] drm/i2c: tda998x: avoid race in tda998x_encoder_mode_set() Russell King
2016-11-08 12:25   ` Russell King
2016-11-18  0:01   ` Russell King - ARM Linux
2016-11-18  0:01     ` Russell King - ARM Linux
2016-11-08 12:25 ` [PATCH RFC 02/12] drm/i2c: tda998x: avoid racy access to mode clock Russell King
2016-11-08 12:25   ` Russell King
2016-11-08 12:25 ` [PATCH RFC 03/12] drm/i2c: tda998x: avoid race when programming audio Russell King
2016-11-08 12:25   ` Russell King
2016-11-08 12:25 ` [PATCH RFC 04/12] drm/i2c: tda998x: only configure infoframes and audio if supported Russell King
2016-11-08 12:25   ` Russell King
2016-11-08 12:25 ` [PATCH RFC 05/12] drm/i2c: tda998x: only enable audio if supported by sink Russell King
2016-11-08 12:25   ` Russell King
2016-11-08 12:25 ` [PATCH RFC 06/12] drm/i2c: tda998x: correct function name in comments Russell King
2016-11-08 12:25   ` Russell King
2016-11-08 12:25 ` [PATCH RFC 07/12] drm/i2c: tda998x: move and rename tda998x_encoder_set_config() Russell King
2016-11-08 12:25   ` Russell King
2016-11-08 12:25 ` [PATCH RFC 08/12] drm/i2c: tda998x: group connector functions and funcs together Russell King
2016-11-08 12:25   ` Russell King
2016-11-08 12:25 ` [PATCH RFC 09/12] drm/i2c: tda998x: separate connector initialisation Russell King
2016-11-08 12:25   ` Russell King
2016-11-08 12:25 ` [PATCH RFC 10/12] drm/i2c: tda998x: group audio functions together Russell King
2016-11-08 12:25   ` Russell King
2016-11-08 12:25 ` [PATCH RFC 11/12] drm/i2c: tda998x: remove complexity from tda998x_audio_get_eld() Russell King
2016-11-08 12:25   ` Russell King
2016-11-08 12:25 ` Russell King [this message]
2016-11-08 12:25   ` [PATCH RFC 12/12] drm/i2c: tda998x: switch to boolean is_on Russell King
2016-11-08 13:19 ` [PATCH RFC 00/12] tda998x updates Robin Murphy
2016-11-08 13:19   ` Robin Murphy
2016-11-08 13:32   ` Russell King - ARM Linux
2016-11-08 13:32     ` Russell King - ARM Linux
2016-11-08 13:34     ` Russell King - ARM Linux
2016-11-08 13:34       ` Russell King - ARM Linux
2016-11-08 15:25       ` Robin Murphy
2016-11-08 15:25         ` Robin Murphy
2016-11-08 15:42         ` Russell King - ARM Linux
2016-11-08 15:42           ` Russell King - ARM Linux
2016-11-08 17:20       ` Jon Medhurst (Tixy)
2016-11-08 17:20         ` Jon Medhurst (Tixy)
2016-11-08 18:24         ` Russell King - ARM Linux
2016-11-08 18:24           ` Russell King - ARM Linux
2016-11-09 11:45           ` Jon Medhurst (Tixy)
2016-11-09 11:45             ` Jon Medhurst (Tixy)
2016-11-09 22:14             ` Russell King - ARM Linux
2016-11-09 22:14               ` Russell King - ARM Linux
2016-11-11 15:10 ` Jyri Sarha
2016-11-11 15:10   ` Jyri Sarha
2016-11-11 15:27   ` Russell King - ARM Linux
2016-11-11 15:27     ` Russell King - ARM Linux
2016-11-11 16:24     ` Jyri Sarha
2016-11-11 16:24       ` Jyri Sarha

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=E1c45TS-0005kT-2y@rmk-PC.armlinux.org.uk \
    --to=rmk+kernel@armlinux.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.