Intel-GFX Archive on lore.kernel.org
 help / color / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH 37/76] drm/i915/dvo: implement get_hw_state
Date: Thu, 26 Jul 2012 20:49:02 +0200
Message-ID: <1343328581-2324-38-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch>

Similar to the sdvo code we poke the dvo encoder whether the output is
active. Safe that dvo encoders are not standardized, so this requires
a new callback into the dvo chip driver.

Hence implement that for all 6 dvo drivers.

v2: With the newly added ns2501 we now have 6 dvo drivers instead of
just 5 ...

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/dvo.h        |    6 ++++++
 drivers/gpu/drm/i915/dvo_ch7017.c |   13 +++++++++++++
 drivers/gpu/drm/i915/dvo_ch7xxx.c |   13 +++++++++++++
 drivers/gpu/drm/i915/dvo_ivch.c   |   15 +++++++++++++++
 drivers/gpu/drm/i915/dvo_ns2501.c |   15 +++++++++++++++
 drivers/gpu/drm/i915/dvo_sil164.c |   16 ++++++++++++++++
 drivers/gpu/drm/i915/dvo_tfp410.c |   14 ++++++++++++++
 drivers/gpu/drm/i915/intel_dvo.c  |   27 +++++++++++++++++++++++++++
 8 files changed, 119 insertions(+)

diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h
index 0fa839e..74b5efc 100644
--- a/drivers/gpu/drm/i915/dvo.h
+++ b/drivers/gpu/drm/i915/dvo.h
@@ -114,6 +114,12 @@ struct intel_dvo_dev_ops {
 	 */
 	enum drm_connector_status (*detect)(struct intel_dvo_device *dvo);
 
+	/*
+	 * Probe the current hw status, returning true if the connected output
+	 * is active.
+	 */
+	bool (*get_hw_state)(struct intel_dvo_device *dev);
+
 	/**
 	 * Query the device for the modes it provides.
 	 *
diff --git a/drivers/gpu/drm/i915/dvo_ch7017.c b/drivers/gpu/drm/i915/dvo_ch7017.c
index 71e7650..86b27d1 100644
--- a/drivers/gpu/drm/i915/dvo_ch7017.c
+++ b/drivers/gpu/drm/i915/dvo_ch7017.c
@@ -359,6 +359,18 @@ static void ch7017_dpms(struct intel_dvo_device *dvo, bool enable)
 	msleep(20);
 }
 
+static bool ch7017_get_hw_state(struct intel_dvo_device *dvo)
+{
+	uint8_t val;
+
+	ch7017_read(dvo, CH7017_LVDS_POWER_DOWN, &val);
+
+	if (val & CH7017_LVDS_POWER_DOWN_EN)
+		return false;
+	else
+		return true;
+}
+
 static void ch7017_dump_regs(struct intel_dvo_device *dvo)
 {
 	uint8_t val;
@@ -396,6 +408,7 @@ struct intel_dvo_dev_ops ch7017_ops = {
 	.mode_valid = ch7017_mode_valid,
 	.mode_set = ch7017_mode_set,
 	.dpms = ch7017_dpms,
+	.get_hw_state = ch7017_get_hw_state,
 	.dump_regs = ch7017_dump_regs,
 	.destroy = ch7017_destroy,
 };
diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c
index c1dea5b..38f3a6c 100644
--- a/drivers/gpu/drm/i915/dvo_ch7xxx.c
+++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c
@@ -297,6 +297,18 @@ static void ch7xxx_dpms(struct intel_dvo_device *dvo, bool enable)
 		ch7xxx_writeb(dvo, CH7xxx_PM, CH7xxx_PM_FPD);
 }
 
+static bool ch7xxx_get_hw_state(struct intel_dvo_device *dvo)
+{
+	u8 val;
+
+	ch7xxx_readb(dvo, CH7xxx_PM, &val);
+
+	if (val & CH7xxx_PM_FPD)
+		return false;
+	else
+		return true;
+}
+
 static void ch7xxx_dump_regs(struct intel_dvo_device *dvo)
 {
 	int i;
@@ -326,6 +338,7 @@ struct intel_dvo_dev_ops ch7xxx_ops = {
 	.mode_valid = ch7xxx_mode_valid,
 	.mode_set = ch7xxx_mode_set,
 	.dpms = ch7xxx_dpms,
+	.get_hw_state = ch7xxx_get_hw_state,
 	.dump_regs = ch7xxx_dump_regs,
 	.destroy = ch7xxx_destroy,
 };
diff --git a/drivers/gpu/drm/i915/dvo_ivch.c b/drivers/gpu/drm/i915/dvo_ivch.c
index fa8ff6b..baaf65b 100644
--- a/drivers/gpu/drm/i915/dvo_ivch.c
+++ b/drivers/gpu/drm/i915/dvo_ivch.c
@@ -323,6 +323,20 @@ static void ivch_dpms(struct intel_dvo_device *dvo, bool enable)
 	udelay(16 * 1000);
 }
 
+static bool ivch_get_hw_state(struct intel_dvo_device *dvo)
+{
+	uint16_t vr01;
+
+	/* Set the new power state of the panel. */
+	if (!ivch_read(dvo, VR01, &vr01))
+		return false;
+
+	if (vr01 & VR01_LCD_ENABLE)
+		return true;
+	else
+		return false;
+}
+
 static void ivch_mode_set(struct intel_dvo_device *dvo,
 			  struct drm_display_mode *mode,
 			  struct drm_display_mode *adjusted_mode)
@@ -413,6 +427,7 @@ static void ivch_destroy(struct intel_dvo_device *dvo)
 struct intel_dvo_dev_ops ivch_ops = {
 	.init = ivch_init,
 	.dpms = ivch_dpms,
+	.get_hw_state = ivch_get_hw_state,
 	.mode_valid = ivch_mode_valid,
 	.mode_set = ivch_mode_set,
 	.detect = ivch_detect,
diff --git a/drivers/gpu/drm/i915/dvo_ns2501.c b/drivers/gpu/drm/i915/dvo_ns2501.c
index c4d9f2f..c4a255b 100644
--- a/drivers/gpu/drm/i915/dvo_ns2501.c
+++ b/drivers/gpu/drm/i915/dvo_ns2501.c
@@ -493,6 +493,20 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo,
 }
 
 /* set the NS2501 power state */
+static bool ns2501_get_hw_state(struct intel_dvo_device *dvo)
+{
+	unsigned char ch;
+
+	if (!ns2501_readb(dvo, NS2501_REG8, &ch))
+		return false;
+
+	if (ch & NS2501_8_PD)
+		return true;
+	else
+		return false;
+}
+
+/* set the NS2501 power state */
 static void ns2501_dpms(struct intel_dvo_device *dvo, bool enable)
 {
 	bool ok;
@@ -568,6 +582,7 @@ struct intel_dvo_dev_ops ns2501_ops = {
 	.mode_valid = ns2501_mode_valid,
 	.mode_set = ns2501_mode_set,
 	.dpms = ns2501_dpms,
+	.get_hw_state = ns2501_get_hw_state,
 	.dump_regs = ns2501_dump_regs,
 	.destroy = ns2501_destroy,
 };
diff --git a/drivers/gpu/drm/i915/dvo_sil164.c b/drivers/gpu/drm/i915/dvo_sil164.c
index cc24c1c..4debd32 100644
--- a/drivers/gpu/drm/i915/dvo_sil164.c
+++ b/drivers/gpu/drm/i915/dvo_sil164.c
@@ -226,6 +226,21 @@ static void sil164_dpms(struct intel_dvo_device *dvo, bool enable)
 	return;
 }
 
+static bool sil164_get_hw_state(struct intel_dvo_device *dvo)
+{
+	int ret;
+	unsigned char ch;
+
+	ret = sil164_readb(dvo, SIL164_REG8, &ch);
+	if (ret == false)
+		return false;
+
+	if (ch & SIL164_8_PD)
+		return true;
+	else
+		return false;
+}
+
 static void sil164_dump_regs(struct intel_dvo_device *dvo)
 {
 	uint8_t val;
@@ -258,6 +273,7 @@ struct intel_dvo_dev_ops sil164_ops = {
 	.mode_valid = sil164_mode_valid,
 	.mode_set = sil164_mode_set,
 	.dpms = sil164_dpms,
+	.get_hw_state = sil164_get_hw_state,
 	.dump_regs = sil164_dump_regs,
 	.destroy = sil164_destroy,
 };
diff --git a/drivers/gpu/drm/i915/dvo_tfp410.c b/drivers/gpu/drm/i915/dvo_tfp410.c
index 097b3e8..e17f1b0 100644
--- a/drivers/gpu/drm/i915/dvo_tfp410.c
+++ b/drivers/gpu/drm/i915/dvo_tfp410.c
@@ -249,6 +249,19 @@ static void tfp410_dpms(struct intel_dvo_device *dvo, bool enable)
 	tfp410_writeb(dvo, TFP410_CTL_1, ctl1);
 }
 
+static bool tfp410_get_hw_state(struct intel_dvo_device *dvo)
+{
+	uint8_t ctl1;
+
+	if (!tfp410_readb(dvo, TFP410_CTL_1, &ctl1))
+		return false;
+
+	if (ctl1 & TFP410_CTL_1_PD)
+		return true;
+	else
+		return false;
+}
+
 static void tfp410_dump_regs(struct intel_dvo_device *dvo)
 {
 	uint8_t val, val2;
@@ -299,6 +312,7 @@ struct intel_dvo_dev_ops tfp410_ops = {
 	.mode_valid = tfp410_mode_valid,
 	.mode_set = tfp410_mode_set,
 	.dpms = tfp410_dpms,
+	.get_hw_state = tfp410_get_hw_state,
 	.dump_regs = tfp410_dump_regs,
 	.destroy = tfp410_destroy,
 };
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 84c0867..e9397b7 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -105,6 +105,31 @@ static struct intel_dvo *intel_attached_dvo(struct drm_connector *connector)
 			    struct intel_dvo, base);
 }
 
+static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector)
+{
+	struct intel_dvo *intel_dvo = intel_attached_dvo(&connector->base);
+
+	return intel_dvo->dev.dev_ops->get_hw_state(&intel_dvo->dev);
+}
+
+static bool intel_dvo_get_hw_state(struct intel_encoder *encoder,
+				   enum pipe *pipe)
+{
+	struct drm_device *dev = encoder->base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct intel_dvo *intel_dvo = enc_to_intel_dvo(&encoder->base);
+	u32 tmp;
+
+	tmp = I915_READ(intel_dvo->dev.dvo_reg);
+
+	if (!(tmp & DVO_ENABLE))
+		return false;
+
+	*pipe = PORT_TO_PIPE(tmp);
+
+	return true;
+}
+
 static void intel_disable_dvo(struct intel_encoder *encoder)
 {
 	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
@@ -414,6 +439,8 @@ void intel_dvo_init(struct drm_device *dev)
 
 	intel_encoder->disable = intel_disable_dvo;
 	intel_encoder->enable = intel_enable_dvo;
+	intel_encoder->get_hw_state = intel_dvo_get_hw_state;
+	intel_connector->get_hw_state = intel_dvo_connector_get_hw_state;
 
 	/* Now, try to find a controller */
 	for (i = 0; i < ARRAY_SIZE(intel_dvo_devices); i++) {
-- 
1.7.10.4

  parent reply index

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-26 18:48 [PATCH 00/76] modeset rework, lightly reworked Daniel Vetter
2012-07-26 18:48 ` [PATCH 01/76] drm/fb-helper: don't clobber output routing in setup_crtcs Daniel Vetter
2012-08-29 16:57   ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 02/76] drm/i915: add missing gen2 pipe A quirk entries Daniel Vetter
2012-08-29 16:58   ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 03/76] drm/i915/ns2501: kill pll A enabling hack Daniel Vetter
2012-08-29 16:59   ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 04/76] drm/i915: rip out the overlay pipe A workaround Daniel Vetter
2012-08-29 16:59   ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 05/76] drm/i915: prepare load-detect pipe code for dpms changes Daniel Vetter
2012-08-29 17:07   ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 06/76] drm/i915: simplify dvo dpms interface Daniel Vetter
2012-08-29 17:09   ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 07/76] drm/i915: kill a few unused things in dev_priv Daniel Vetter
2012-08-29 17:37   ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 08/76] drm/i915: extract ironlake_fdi_pll_disable Daniel Vetter
2012-08-29 17:47   ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 09/76] drm/i915: add crtc->enable/disable vfuncs insted of dpms Daniel Vetter
2012-08-29 17:49   ` Jesse Barnes
2012-07-26 18:48 ` [PATCH 10/76] drm/i915: rip out crtc prepare/commit indirection Daniel Vetter
2012-07-26 18:48 ` [PATCH 11/76] drm/i915: add direct encoder disable/enable infrastructure Daniel Vetter
2012-07-26 18:48 ` [PATCH 12/76] drm/i915/hdmi: convert to encoder->disable/enable Daniel Vetter
2012-07-26 18:48 ` [PATCH 13/76] drm/i915/tv: convert to encoder enable/disable Daniel Vetter
2012-07-26 18:48 ` [PATCH 14/76] drm/i915/lvds: convert to encoder disable/enable Daniel Vetter
2012-07-26 18:48 ` [PATCH 15/76] drm/i915/dp: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 16/76] drm/i915/crt: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 17/76] drm/i915/sdvo: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 18/76] drm/i915/dvo: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 19/76] drm/i915: convert dpms functions of dvo/sdvo/crt Daniel Vetter
2012-07-26 18:48 ` [PATCH 20/76] drm/i915: rip out encoder->disable/enable checks Daniel Vetter
2012-07-26 18:48 ` [PATCH 21/76] drm/i915: clean up encoder_prepare/commit Daniel Vetter
2012-07-26 18:48 ` [PATCH 22/76] drm/i915: copy&paste drm_crtc_helper_set_config Daniel Vetter
2012-07-26 18:48 ` [PATCH 23/76] drm/i915: call set_base directly Daniel Vetter
2012-07-26 18:48 ` [PATCH 24/76] drm/i915: inline intel_best_encoder Daniel Vetter
2012-07-26 18:48 ` [PATCH 25/76] drm/i915: copy&paste drm_crtc_helper_set_mode Daniel Vetter
2012-07-26 18:48 ` [PATCH 26/76] drm/i915: simplify intel_crtc_prepare_encoders Daniel Vetter
2012-07-26 18:48 ` [PATCH 27/76] drm/i915: rip out encoder->prepare/commit Daniel Vetter
2012-07-26 18:48 ` [PATCH 28/76] drm/i915: call crtc functions directly Daniel Vetter
2012-07-26 18:48 ` [PATCH 29/76] drm/i915: WARN when trying to enabled an unused crtc Daniel Vetter
2012-07-26 18:48 ` [PATCH 30/76] drm/i915: Add interfaces to read out encoder/connector hw state Daniel Vetter
2012-07-26 18:48 ` [PATCH 31/76] drm/i915/dp: implement get_hw_state Daniel Vetter
2012-07-26 18:48 ` [PATCH 32/76] drm/i915/hdmi: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 33/76] drm/i915/tv: " Daniel Vetter
2012-07-26 18:48 ` [PATCH 34/76] drm/i915/lvds: " Daniel Vetter
2012-07-26 18:49 ` [PATCH 35/76] drm/i915/crt: " Daniel Vetter
2012-07-26 18:49 ` [PATCH 36/76] drm/i915/sdvo: " Daniel Vetter
2012-07-26 18:49 ` Daniel Vetter [this message]
2012-07-26 18:49 ` [PATCH 38/76] drm/i915: read out the modeset hw state at load and resume time Daniel Vetter
2012-07-26 18:49 ` [PATCH 39/76] drm/i915: check connector hw/sw state Daniel Vetter
2012-07-26 18:49 ` [PATCH 40/76] drm/i915: rip out intel_crtc->dpms_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 41/76] drm/i915: rip out intel_dp->dpms_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 42/76] drm/i915: ensure the force pipe A quirk is actually followed Daniel Vetter
2012-07-26 18:49 ` [PATCH 43/76] drm/i915: introduce struct intel_set_config Daniel Vetter
2012-07-26 18:49 ` [PATCH 44/76] drm/i915: extract modeset config save/restore code Daniel Vetter
2012-07-26 18:49 ` [PATCH 45/76] drm/i915: extract intel_set_config_compute_mode_changes Daniel Vetter
2012-07-26 18:49 ` [PATCH 46/76] drm/i915: extract intel_set_config_update_output_state Daniel Vetter
2012-07-26 18:49 ` [PATCH 47/76] drm/i915: implement crtc helper semantics relied upon by the fb helper Daniel Vetter
2012-07-26 18:49 ` [PATCH 48/76] drm/i915: don't update the fb base if there is no fb Daniel Vetter
2012-07-26 18:49 ` [PATCH 49/76] drm/i915: convert pointless error checks in set_config to BUGs Daniel Vetter
2012-07-26 18:49 ` [PATCH 50/76] drm/i915: don't save all the encoder/crtc state in set_config Daniel Vetter
2012-07-26 18:49 ` [PATCH 51/76] drm/i915: stage modeset output changes Daniel Vetter
2012-07-26 18:49 ` [PATCH 52/76] drm/i915: push crtc->fb update into pipe_set_base Daniel Vetter
2012-07-26 18:49 ` [PATCH 53/76] drm/i915: remove crtc disabling special case Daniel Vetter
2012-07-26 18:49 ` [PATCH 54/76] drm/i915: move output commit and crtc disabling into set_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 55/76] drm/i915: extract adjusted mode computation Daniel Vetter
2012-07-26 18:49 ` [PATCH 56/76] drm/i915: use staged outuput config in tv->mode_fixup Daniel Vetter
2012-07-26 18:49 ` [PATCH 57/76] drm/i915: use staged outuput config in lvds->mode_fixup Daniel Vetter
2012-07-26 18:49 ` [PATCH 58/76] drm/i915: compute masks of crtcs affected in set_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 59/76] drm/i915: implement new set_mode code flow Daniel Vetter
2012-07-26 18:49 ` [PATCH 60/76] drm/i915: push commit_output_state past crtc disabling Daniel Vetter
2012-07-26 18:49 ` [PATCH 61/76] drm/i915: s/intel_encoder_disable/intel_encoder_noop Daniel Vetter
2012-07-26 18:49 ` [PATCH 62/76] drm/i915: WARN if the pipe won't turn off Daniel Vetter
2012-07-26 18:49 ` [PATCH 63/76] drm/i915: switch the load detect code to the staged modeset config Daniel Vetter
2012-07-26 18:49 ` [PATCH 64/76] drm/i915: push commit_output_state past the crtc/encoder preparing Daniel Vetter
2012-07-26 18:49 ` [PATCH 65/76] drm/i915: disable all crtcs at suspend time Daniel Vetter
2012-07-26 18:49 ` [PATCH 66/76] drm/i915: add tons of modeset state checks Daniel Vetter
2012-07-26 18:49 ` [PATCH 67/76] drm/i915: rip out intel_disable_pch_ports Daniel Vetter
2012-07-26 18:49 ` [PATCH 68/76] drm/i915: don't disable fdi links harder in ilk_crtc_enable Daniel Vetter
2012-07-26 18:49 ` [PATCH 69/76] drm/i915: don't call dpms funcs after set_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 70/76] drm/i915: update dpms property in set_mode Daniel Vetter
2012-07-26 18:49 ` [PATCH 71/76] drm/i915: add encoder->pre_enable/post_disable Daniel Vetter
2012-07-26 18:49 ` [PATCH 72/76] drm/i915: clean up the cpu edp pll special case Daniel Vetter
2012-07-26 18:49 ` [PATCH 73/76] drm/i915: robustify edp_pll_on/off Daniel Vetter
2012-07-26 18:49 ` [PATCH 74/76] drm/i915: rip out dp port enabling cludges^Wchecks Daniel Vetter
2012-07-26 18:49 ` [PATCH 75/76] drm/i915: disable the cpu edp port after the cpu pipe Daniel Vetter
2012-07-26 18:49 ` [PATCH 76/76] drm/i915: move encoder->mode_set calls to crtc_mode_set Daniel Vetter

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=1343328581-2324-38-git-send-email-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.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

Intel-GFX Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/intel-gfx/0 intel-gfx/git/0.git
	git clone --mirror https://lore.kernel.org/intel-gfx/1 intel-gfx/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 intel-gfx intel-gfx/ https://lore.kernel.org/intel-gfx \
		intel-gfx@lists.freedesktop.org
	public-inbox-index intel-gfx

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.freedesktop.lists.intel-gfx


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git