public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: set the right SDVO transcoder for CPT
@ 2011-10-13 12:49 przanoni
  2011-10-13 13:38 ` Adam Jackson
                   ` (5 more replies)
  0 siblings, 6 replies; 14+ messages in thread
From: przanoni @ 2011-10-13 12:49 UTC (permalink / raw)
  To: intel-gfx; +Cc: Paulo Zanoni

From: Paulo Zanoni <paulo.r.zanoni@intel.com>

Fixes fd.o #41272

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 drivers/gpu/drm/i915/intel_sdvo.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

It would be nice to have this in Kernel 3.1 too

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index aa94110..c66c0b4 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1080,8 +1080,16 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
 		}
 		sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
 	}
-	if (intel_crtc->pipe == 1)
+
+	if (intel_sdvo->sdvo_reg == PCH_SDVOB) {
+	    if (HAS_PCH_IBX(dev))
+		sdvox |= TRANSCODER(intel_crtc->pipe);
+	    else
+		sdvox |= PORT_TRANS_SEL_CPT(intel_crtc->pipe);
+	} else if (intel_crtc->pipe == 1) {
 		sdvox |= SDVO_PIPE_B_SELECT;
+	}
+
 	if (intel_sdvo->has_hdmi_audio)
 		sdvox |= SDVO_AUDIO_ENABLE;
 
-- 
1.7.6.3

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* Re: [PATCH] drm/i915: set the right SDVO transcoder for CPT
  2011-10-13 12:49 [PATCH] drm/i915: set the right SDVO transcoder for CPT przanoni
@ 2011-10-13 13:38 ` Adam Jackson
  2011-10-13 13:51 ` Chris Wilson
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 14+ messages in thread
From: Adam Jackson @ 2011-10-13 13:38 UTC (permalink / raw)
  To: przanoni; +Cc: intel-gfx, Paulo Zanoni


[-- Attachment #1.1: Type: text/plain, Size: 255 bytes --]

On Thu, 2011-10-13 at 09:49 -0300, przanoni@gmail.com wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> Fixes fd.o #41272
> 
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

Reviewed-by: Adam Jackson <ajax@redhat.com>

- ajax

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH] drm/i915: set the right SDVO transcoder for CPT
  2011-10-13 12:49 [PATCH] drm/i915: set the right SDVO transcoder for CPT przanoni
  2011-10-13 13:38 ` Adam Jackson
@ 2011-10-13 13:51 ` Chris Wilson
  2011-10-13 17:41 ` przanoni
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 14+ messages in thread
From: Chris Wilson @ 2011-10-13 13:51 UTC (permalink / raw)
  To: przanoni, intel-gfx; +Cc: Paulo Zanoni

On Thu, 13 Oct 2011 09:49:19 -0300, przanoni@gmail.com wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> Fixes fd.o #41272

Jesse has already posted a better patch in his IVB series.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH] drm/i915: set the right SDVO transcoder for CPT
  2011-10-13 12:49 [PATCH] drm/i915: set the right SDVO transcoder for CPT przanoni
  2011-10-13 13:38 ` Adam Jackson
  2011-10-13 13:51 ` Chris Wilson
@ 2011-10-13 17:41 ` przanoni
  2011-10-13 20:39   ` Chris Wilson
  2011-10-14 21:16 ` [PATCH 1/3] " przanoni
                   ` (2 subsequent siblings)
  5 siblings, 1 reply; 14+ messages in thread
From: przanoni @ 2011-10-13 17:41 UTC (permalink / raw)
  To: intel-gfx; +Cc: stable, Paulo Zanoni

From: Paulo Zanoni <paulo.r.zanoni@intel.com>

Fixes fd.o #41272

v2: add a CPT-specific macro, make code cleaner

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h   |    8 ++++----
 drivers/gpu/drm/i915/intel_sdvo.c |    8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 138eae1..e02b64c 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3275,10 +3275,10 @@
 /* or SDVOB */
 #define HDMIB   0xe1140
 #define  PORT_ENABLE    (1 << 31)
-#define  TRANSCODER_A   (0)
-#define  TRANSCODER_B   (1 << 30)
-#define  TRANSCODER(pipe)	((pipe) << 30)
-#define  TRANSCODER_MASK   (1 << 30)
+#define  TRANSCODER(pipe)       ((pipe) << 30)
+#define  TRANSCODER_CPT(pipe)   ((pipe) << 29)
+#define  TRANSCODER_MASK        (1 << 30)
+#define  TRANSCODER_MASK_CPT    (3 << 29)
 #define  COLOR_FORMAT_8bpc      (0)
 #define  COLOR_FORMAT_12bpc     (3 << 26)
 #define  SDVOB_HOTPLUG_ENABLE   (1 << 23)
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index aa94110..85fc976 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1080,8 +1080,12 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
 		}
 		sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
 	}
-	if (intel_crtc->pipe == 1)
-		sdvox |= SDVO_PIPE_B_SELECT;
+
+	if (INTEL_PCH_TYPE(dev) >= PCH_CPT)
+		sdvox |= TRANSCODER_CPT(intel_crtc->pipe);
+	else
+		sdvox |= TRANSCODER(intel_crtc->pipe);
+
 	if (intel_sdvo->has_hdmi_audio)
 		sdvox |= SDVO_AUDIO_ENABLE;
 
-- 
1.7.6.3

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* Re: [PATCH] drm/i915: set the right SDVO transcoder for CPT
  2011-10-13 17:41 ` przanoni
@ 2011-10-13 20:39   ` Chris Wilson
  0 siblings, 0 replies; 14+ messages in thread
From: Chris Wilson @ 2011-10-13 20:39 UTC (permalink / raw)
  To: przanoni, intel-gfx; +Cc: stable, Paulo Zanoni

On Thu, 13 Oct 2011 14:41:38 -0300, przanoni@gmail.com wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> Fixes fd.o #41272

I prefer

  Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41272

and would think Rafel's script do as well ;-)

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Can I talk you into submitting a patch to add

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_deb
index 3c395a5..58e4909 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -61,6 +61,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
        const struct intel_device_info *info = INTEL_INFO(dev);
 
        seq_printf(m, "gen: %d\n", info->gen);
+       seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(dev));
 #define B(x) seq_printf(m, #x ": %s\n", yesno(info->x))
        B(is_mobile);
        B(is_i85x);

as well?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH 1/3] drm/i915: set the right SDVO transcoder for CPT
  2011-10-13 12:49 [PATCH] drm/i915: set the right SDVO transcoder for CPT przanoni
                   ` (2 preceding siblings ...)
  2011-10-13 17:41 ` przanoni
@ 2011-10-14 21:16 ` przanoni
  2011-10-14 21:30   ` Chris Wilson
  2011-10-14 21:17 ` [PATCH 2/3] drm/i915: Rename HDMI register field definitions przanoni
  2011-10-14 21:17 ` [PATCH 3/3] drm/i915: add PCH info to i915_capabilities przanoni
  5 siblings, 1 reply; 14+ messages in thread
From: przanoni @ 2011-10-14 21:16 UTC (permalink / raw)
  To: intel-gfx; +Cc: stable, Paulo Zanoni

From: Paulo Zanoni <paulo.r.zanoni@intel.com>

v2: add a CPT-specific macro, make code cleaner
v3: fix commit message

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41272
Cc: stable@kernel.org
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h   |    8 ++++----
 drivers/gpu/drm/i915/intel_sdvo.c |    8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 138eae1..e02b64c 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3275,10 +3275,10 @@
 /* or SDVOB */
 #define HDMIB   0xe1140
 #define  PORT_ENABLE    (1 << 31)
-#define  TRANSCODER_A   (0)
-#define  TRANSCODER_B   (1 << 30)
-#define  TRANSCODER(pipe)	((pipe) << 30)
-#define  TRANSCODER_MASK   (1 << 30)
+#define  TRANSCODER(pipe)       ((pipe) << 30)
+#define  TRANSCODER_CPT(pipe)   ((pipe) << 29)
+#define  TRANSCODER_MASK        (1 << 30)
+#define  TRANSCODER_MASK_CPT    (3 << 29)
 #define  COLOR_FORMAT_8bpc      (0)
 #define  COLOR_FORMAT_12bpc     (3 << 26)
 #define  SDVOB_HOTPLUG_ENABLE   (1 << 23)
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index aa94110..85fc976 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1080,8 +1080,12 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
 		}
 		sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
 	}
-	if (intel_crtc->pipe == 1)
-		sdvox |= SDVO_PIPE_B_SELECT;
+
+	if (INTEL_PCH_TYPE(dev) >= PCH_CPT)
+		sdvox |= TRANSCODER_CPT(intel_crtc->pipe);
+	else
+		sdvox |= TRANSCODER(intel_crtc->pipe);
+
 	if (intel_sdvo->has_hdmi_audio)
 		sdvox |= SDVO_AUDIO_ENABLE;
 
-- 
1.7.6.3

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH 2/3] drm/i915: Rename HDMI register field definitions
  2011-10-13 12:49 [PATCH] drm/i915: set the right SDVO transcoder for CPT przanoni
                   ` (3 preceding siblings ...)
  2011-10-14 21:16 ` [PATCH 1/3] " przanoni
@ 2011-10-14 21:17 ` przanoni
  2011-10-14 21:39   ` Chris Wilson
  2011-10-14 21:17 ` [PATCH 3/3] drm/i915: add PCH info to i915_capabilities przanoni
  5 siblings, 1 reply; 14+ messages in thread
From: przanoni @ 2011-10-14 21:17 UTC (permalink / raw)
  To: intel-gfx; +Cc: Paulo Zanoni

From: Paulo Zanoni <paulo.r.zanoni@intel.com>

Also making the differences between HDMI{B,C,D} and SDVO registers for
non-PCH, IBX and CPT more explicit.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h      |   49 ++++++++++++++++++++--------------
 drivers/gpu/drm/i915/intel_display.c |   16 ++++++-----
 drivers/gpu/drm/i915/intel_hdmi.c    |    6 ++--
 drivers/gpu/drm/i915/intel_sdvo.c    |    5 ++-
 4 files changed, 44 insertions(+), 32 deletions(-)

As discussed on IRC

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index e02b64c..8fdee99 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3272,27 +3272,36 @@
 #define  ADPA_CRT_HOTPLUG_VOLREF_475MV  (1<<17)
 #define  ADPA_CRT_HOTPLUG_FORCE_TRIGGER (1<<16)
 
-/* or SDVOB */
+/*
+ * - Fields named "HDMI" are present for HDMI{B,C,D}
+ * - Fields named "PCH_SDVO" are present only for HDMIB (aka PCH_SDVOB or
+ *   SDVO_HDMI_CTL on newer chips). Some of them, not all, are compatible with
+ *   the old SDVO registers (SDVOB, SDVOC)
+ * - Fields valid only for IBX have the _IBX suffix
+ * - Fields valid only for CPT (and newer?) have the _CPT suffix
+ */
 #define HDMIB   0xe1140
-#define  PORT_ENABLE    (1 << 31)
-#define  TRANSCODER(pipe)       ((pipe) << 30)
-#define  TRANSCODER_CPT(pipe)   ((pipe) << 29)
-#define  TRANSCODER_MASK        (1 << 30)
-#define  TRANSCODER_MASK_CPT    (3 << 29)
-#define  COLOR_FORMAT_8bpc      (0)
-#define  COLOR_FORMAT_12bpc     (3 << 26)
-#define  SDVOB_HOTPLUG_ENABLE   (1 << 23)
-#define  SDVO_ENCODING          (0)
-#define  TMDS_ENCODING          (2 << 10)
-#define  NULL_PACKET_VSYNC_ENABLE       (1 << 9)
-/* CPT */
-#define  HDMI_MODE_SELECT	(1 << 9)
-#define  DVI_MODE_SELECT	(0)
-#define  SDVOB_BORDER_ENABLE    (1 << 7)
-#define  AUDIO_ENABLE           (1 << 6)
-#define  VSYNC_ACTIVE_HIGH      (1 << 4)
-#define  HSYNC_ACTIVE_HIGH      (1 << 3)
-#define  PORT_DETECTED          (1 << 2)
+#define HDMI_PORT_ENABLE            (1 << 31)
+#define HDMI_TRANSCODER_IBX(pipe)   ((pipe) << 30)
+#define HDMI_TRANSCODER_CPT(pipe)   ((pipe) << 29)
+#define HDMI_TRANSCODER_MASK_IBX    (1 << 30)
+#define HDMI_TRANSCODER_MASK_CPT    (3 << 29)
+#define HDMI_COLOR_FORMAT_8bpc      (0 << 26)
+#define HDMI_COLOR_FORMAT_12bpc     (3 << 26)
+#define HDMI_COLOR_MASK             (7 << 26)
+#define PCH_SDVO_STALL_SELECT_IBX   SDVO_STALL_SELECT
+#define PCH_SDVO_STALL_SELECT_CPT   (1 << 25)
+#define PCH_SDVO_HOTPLUG_INT_ENABLE (1 << 23)
+#define PCH_SDVO_ENCODING_SDVO      SDVO_ENCODING_SDVO
+#define PCH_SDVO_ENCODING_TMDS      SDVO_ENCODING_HDMI
+#define PCH_SDVO_ENCODING_MASK      (3 << 10)
+#define HDMI_MODE_DVI               (0 << 9)
+#define HDMI_MODE_HDMI              SDVO_NULL_PACKETS_DURING_VSYNC
+#define PCH_SDVO_BORDER_ENABLE      SDVO_BORDER_ENABLE
+#define HDMI_AUDIO_ENABLE           SDVO_AUDIO_ENABLE
+#define HDMI_VSYNC_ACTIVE_HIGH      SDVO_VSYNC_ACTIVE_HIGH
+#define HDMI_HSYNC_ACTIVE_HIGH      SDVO_HSYNC_ACTIVE_HIGH
+#define HDMI_PORT_DETECTED          SDVO_DETECTED
 
 /* PCH SDVOB multiplex with HDMIB */
 #define PCH_SDVOB	HDMIB
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f0e5f9f..d18db3b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1002,14 +1002,16 @@ static bool dp_pipe_enabled(struct drm_i915_private *dev_priv,
 static bool hdmi_pipe_enabled(struct drm_i915_private *dev_priv,
 			      enum pipe pipe, u32 val)
 {
-	if ((val & PORT_ENABLE) == 0)
+	if ((val & HDMI_PORT_ENABLE) == 0)
 		return false;
 
 	if (HAS_PCH_CPT(dev_priv->dev)) {
-		if ((val & PORT_TRANS_SEL_MASK) != PORT_TRANS_SEL_CPT(pipe))
+		if ((val & HDMI_TRANSCODER_MASK_CPT) !=
+		    HDMI_TRANSCODER_CPT(pipe))
 			return false;
 	} else {
-		if ((val & TRANSCODER_MASK) != TRANSCODER(pipe))
+		if ((val & HDMI_TRANSCODER_MASK_IBX) !=
+		    HDMI_TRANSCODER_IBX(pipe))
 			return false;
 	}
 	return true;
@@ -1421,7 +1423,7 @@ static void disable_pch_hdmi(struct drm_i915_private *dev_priv,
 	if (hdmi_pipe_enabled(dev_priv, val, pipe)) {
 		DRM_DEBUG_KMS("Disabling pch HDMI %x on pipe %d\n",
 			      reg, pipe);
-		I915_WRITE(reg, val & ~PORT_ENABLE);
+		I915_WRITE(reg, val & ~HDMI_PORT_ENABLE);
 	}
 }
 
@@ -7292,7 +7294,7 @@ static void intel_setup_outputs(struct drm_device *dev)
 	if (HAS_PCH_SPLIT(dev)) {
 		int found;
 
-		if (I915_READ(HDMIB) & PORT_DETECTED) {
+		if (I915_READ(HDMIB) & HDMI_PORT_DETECTED) {
 			/* PCH SDVOB multiplex with HDMIB */
 			found = intel_sdvo_init(dev, PCH_SDVOB);
 			if (!found)
@@ -7301,10 +7303,10 @@ static void intel_setup_outputs(struct drm_device *dev)
 				intel_dp_init(dev, PCH_DP_B);
 		}
 
-		if (I915_READ(HDMIC) & PORT_DETECTED)
+		if (I915_READ(HDMIC) & HDMI_PORT_DETECTED)
 			intel_hdmi_init(dev, HDMIC);
 
-		if (I915_READ(HDMID) & PORT_DETECTED)
+		if (I915_READ(HDMID) & HDMI_PORT_DETECTED)
 			intel_hdmi_init(dev, HDMID);
 
 		if (I915_READ(PCH_DP_C) & DP_DETECTED)
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 75026ba..27e7ebf 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -236,13 +236,13 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder,
 		sdvox |= SDVO_HSYNC_ACTIVE_HIGH;
 
 	if (intel_crtc->bpp > 24)
-		sdvox |= COLOR_FORMAT_12bpc;
+		sdvox |= HDMI_COLOR_FORMAT_12bpc;
 	else
-		sdvox |= COLOR_FORMAT_8bpc;
+		sdvox |= HDMI_COLOR_FORMAT_8bpc;
 
 	/* Required on CPT */
 	if (intel_hdmi->has_hdmi_sink && HAS_PCH_CPT(dev))
-		sdvox |= HDMI_MODE_SELECT;
+		sdvox |= HDMI_MODE_HDMI;
 
 	if (intel_hdmi->has_audio) {
 		DRM_DEBUG_DRIVER("Enabling HDMI audio on pipe %c\n",
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 85fc976..2c31c0d 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1082,9 +1082,10 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
 	}
 
 	if (INTEL_PCH_TYPE(dev) >= PCH_CPT)
-		sdvox |= TRANSCODER_CPT(intel_crtc->pipe);
+		sdvox |= HDMI_TRANSCODER_CPT(intel_crtc->pipe);
 	else
-		sdvox |= TRANSCODER(intel_crtc->pipe);
+		/* works for IBX and non-PCH */
+		sdvox |= HDMI_TRANSCODER_IBX(intel_crtc->pipe);
 
 	if (intel_sdvo->has_hdmi_audio)
 		sdvox |= SDVO_AUDIO_ENABLE;
-- 
1.7.6.3

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH 3/3] drm/i915: add PCH info to i915_capabilities
  2011-10-13 12:49 [PATCH] drm/i915: set the right SDVO transcoder for CPT przanoni
                   ` (4 preceding siblings ...)
  2011-10-14 21:17 ` [PATCH 2/3] drm/i915: Rename HDMI register field definitions przanoni
@ 2011-10-14 21:17 ` przanoni
  2011-10-14 21:34   ` Chris Wilson
  5 siblings, 1 reply; 14+ messages in thread
From: przanoni @ 2011-10-14 21:17 UTC (permalink / raw)
  To: intel-gfx; +Cc: Paulo Zanoni

From: Paulo Zanoni <paulo.r.zanoni@intel.com>

Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Chris actually wrote the patch, not just suggested it...

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 8e95d66..9fdabd6 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -61,6 +61,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
 	const struct intel_device_info *info = INTEL_INFO(dev);
 
 	seq_printf(m, "gen: %d\n", info->gen);
+	seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(dev));
 #define B(x) seq_printf(m, #x ": %s\n", yesno(info->x))
 	B(is_mobile);
 	B(is_i85x);
-- 
1.7.6.3

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] drm/i915: set the right SDVO transcoder for CPT
  2011-10-14 21:16 ` [PATCH 1/3] " przanoni
@ 2011-10-14 21:30   ` Chris Wilson
  2011-10-24 19:34     ` Paulo Zanoni
  0 siblings, 1 reply; 14+ messages in thread
From: Chris Wilson @ 2011-10-14 21:30 UTC (permalink / raw)
  To: przanoni, intel-gfx; +Cc: stable, Paulo Zanoni

On Fri, 14 Oct 2011 18:16:22 -0300, przanoni@gmail.com wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> v2: add a CPT-specific macro, make code cleaner
> v3: fix commit message
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41272
> Cc: stable@kernel.org
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] drm/i915: add PCH info to i915_capabilities
  2011-10-14 21:17 ` [PATCH 3/3] drm/i915: add PCH info to i915_capabilities przanoni
@ 2011-10-14 21:34   ` Chris Wilson
  2011-10-24 19:44     ` Paulo Zanoni
  0 siblings, 1 reply; 14+ messages in thread
From: Chris Wilson @ 2011-10-14 21:34 UTC (permalink / raw)
  To: przanoni, intel-gfx; +Cc: Paulo Zanoni

On Fri, 14 Oct 2011 18:17:41 -0300, przanoni@gmail.com wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> Chris actually wrote the patch, not just suggested it...

I didn't even compile check it ;-)

In that case, also include my signed-of-by rather than suggested-by.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] drm/i915: Rename HDMI register field definitions
  2011-10-14 21:17 ` [PATCH 2/3] drm/i915: Rename HDMI register field definitions przanoni
@ 2011-10-14 21:39   ` Chris Wilson
  2011-10-17 19:04     ` Paulo Zanoni
  0 siblings, 1 reply; 14+ messages in thread
From: Chris Wilson @ 2011-10-14 21:39 UTC (permalink / raw)
  To: przanoni, intel-gfx; +Cc: Paulo Zanoni

On Fri, 14 Oct 2011 18:17:09 -0300, przanoni@gmail.com wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> Also making the differences between HDMI{B,C,D} and SDVO registers for
> non-PCH, IBX and CPT more explicit.
> 
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

I'm a little more dubious over the value of this patch. The extra
information is nice, but the patch doesn't impact much upon the
readibility of the code. It seems like this should have the potential to
clarify quite a bit of the logic and make it more consistent, yet that
is not addressed here. Do you have plans to make use of the cleanup?
Does it catch any bugs?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] drm/i915: Rename HDMI register field definitions
  2011-10-14 21:39   ` Chris Wilson
@ 2011-10-17 19:04     ` Paulo Zanoni
  0 siblings, 0 replies; 14+ messages in thread
From: Paulo Zanoni @ 2011-10-17 19:04 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

2011/10/14 Chris Wilson <chris@chris-wilson.co.uk>:
> I'm a little more dubious over the value of this patch. The extra
> information is nice, but the patch doesn't impact much upon the
> readibility of the code. It seems like this should have the potential to
> clarify quite a bit of the logic and make it more consistent, yet that
> is not addressed here. Do you have plans to make use of the cleanup?

Well, "readability" has a different definition for each different
reader. The patch was based on my own definition, but I'm open to
suggestions. If you think it's not worth, just drop it: no problem.

> Does it catch any bugs?

Not yet, but it would have helped catch the one from my previous patch...
-- 
Paulo Zanoni

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] drm/i915: set the right SDVO transcoder for CPT
  2011-10-14 21:30   ` Chris Wilson
@ 2011-10-24 19:34     ` Paulo Zanoni
  0 siblings, 0 replies; 14+ messages in thread
From: Paulo Zanoni @ 2011-10-24 19:34 UTC (permalink / raw)
  To: Keith Packard; +Cc: intel-gfx

Hi Keith,

This patch isn't in your -next pull request. Please consider merging for
3.2.

Thank you,
Paulo

2011/10/14 Chris Wilson <chris@chris-wilson.co.uk>:
> On Fri, 14 Oct 2011 18:16:22 -0300, przanoni@gmail.com wrote:
>> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>
>> v2: add a CPT-specific macro, make code cleaner
>> v3: fix commit message
>>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41272
>> Cc: stable@kernel.org
>> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris
>
> --
> Chris Wilson, Intel Open Source Technology Centre
>



-- 
Paulo Zanoni

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] drm/i915: add PCH info to i915_capabilities
  2011-10-14 21:34   ` Chris Wilson
@ 2011-10-24 19:44     ` Paulo Zanoni
  0 siblings, 0 replies; 14+ messages in thread
From: Paulo Zanoni @ 2011-10-24 19:44 UTC (permalink / raw)
  To: Keith Packard; +Cc: intel-gfx

Hi Keith,

This patch isn't in your -next pull request. Please consider merging for
3.2.

Thank you,
Paulo

2011/10/14 Chris Wilson <chris@chris-wilson.co.uk>:
> On Fri, 14 Oct 2011 18:17:41 -0300, przanoni@gmail.com wrote:
>> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>
>> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
>> ---
>>  drivers/gpu/drm/i915/i915_debugfs.c |    1 +
>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> Chris actually wrote the patch, not just suggested it...
>
> I didn't even compile check it ;-)
>
> In that case, also include my signed-of-by rather than suggested-by.
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris
>
> --
> Chris Wilson, Intel Open Source Technology Centre
>



-- 
Paulo Zanoni

^ permalink raw reply	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2011-10-24 19:44 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-13 12:49 [PATCH] drm/i915: set the right SDVO transcoder for CPT przanoni
2011-10-13 13:38 ` Adam Jackson
2011-10-13 13:51 ` Chris Wilson
2011-10-13 17:41 ` przanoni
2011-10-13 20:39   ` Chris Wilson
2011-10-14 21:16 ` [PATCH 1/3] " przanoni
2011-10-14 21:30   ` Chris Wilson
2011-10-24 19:34     ` Paulo Zanoni
2011-10-14 21:17 ` [PATCH 2/3] drm/i915: Rename HDMI register field definitions przanoni
2011-10-14 21:39   ` Chris Wilson
2011-10-17 19:04     ` Paulo Zanoni
2011-10-14 21:17 ` [PATCH 3/3] drm/i915: add PCH info to i915_capabilities przanoni
2011-10-14 21:34   ` Chris Wilson
2011-10-24 19:44     ` Paulo Zanoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox