Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] intel_audio_dump: fix missing Audio DIP tabs
@ 2012-01-16 23:18 Wu Fengguang
  2012-01-16 23:19 ` [PATCH 2/2] intel_audio_dump: show more AUD_CONFIG bits Wu Fengguang
  0 siblings, 1 reply; 4+ messages in thread
From: Wu Fengguang @ 2012-01-16 23:18 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: intel-gfx@lists.freedesktop..., Dodonov, Eugeni

This makes the SNB/IVY Audio DIP values aligned with others.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
 tools/intel_audio_dump.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- intel-gpu-tools.orig/tools/intel_audio_dump.c	2012-01-16 15:33:11.000000000 +0800
+++ intel-gpu-tools/tools/intel_audio_dump.c	2012-01-16 15:33:18.000000000 +0800
@@ -1207,7 +1207,7 @@ static void dump_cpt(void)
     dword = INREG(AUD_CNTL_ST_A);
     printf("AUD_CNTL_ST_A  DIP_Port_Select\t\t\t\t[%#lx] %s\n",
 					BITS(dword, 30, 29), dip_port[BITS(dword, 30, 29)]);
-    printf("AUD_CNTL_ST_A  DIP_type_enable_status Audio DIP\t%lu\n", BIT(dword, 21));
+    printf("AUD_CNTL_ST_A  DIP_type_enable_status Audio DIP\t\t%lu\n", BIT(dword, 21));
     printf("AUD_CNTL_ST_A  DIP_type_enable_status ACP DIP\t\t%lu\n", BIT(dword, 22));
     printf("AUD_CNTL_ST_A  DIP_type_enable_status Generic 2 DIP\t%lu\n", BIT(dword, 23));
     printf("AUD_CNTL_ST_A  DIP_transmission_frequency\t\t[0x%lx] %s\n",
@@ -1218,7 +1218,7 @@ static void dump_cpt(void)
     dword = INREG(AUD_CNTL_ST_B);
     printf("AUD_CNTL_ST_B  DIP_Port_Select\t\t\t\t[%#lx] %s\n",
 					BITS(dword, 30, 29), dip_port[BITS(dword, 30, 29)]);
-    printf("AUD_CNTL_ST_B  DIP_type_enable_status Audio DIP\t%lu\n", BIT(dword, 21));
+    printf("AUD_CNTL_ST_B  DIP_type_enable_status Audio DIP\t\t%lu\n", BIT(dword, 21));
     printf("AUD_CNTL_ST_B  DIP_type_enable_status ACP DIP\t\t%lu\n", BIT(dword, 22));
     printf("AUD_CNTL_ST_B  DIP_type_enable_status Generic 2 DIP\t%lu\n", BIT(dword, 23));
     printf("AUD_CNTL_ST_B  DIP_transmission_frequency\t\t[0x%lx] %s\n",
@@ -1229,7 +1229,7 @@ static void dump_cpt(void)
     dword = INREG(AUD_CNTL_ST_C);
     printf("AUD_CNTL_ST_C  DIP_Port_Select\t\t\t\t[%#lx] %s\n",
 					BITS(dword, 30, 29), dip_port[BITS(dword, 30, 29)]);
-    printf("AUD_CNTL_ST_C  DIP_type_enable_status Audio DIP\t%lu\n", BIT(dword, 21));
+    printf("AUD_CNTL_ST_C  DIP_type_enable_status Audio DIP\t\t%lu\n", BIT(dword, 21));
     printf("AUD_CNTL_ST_C  DIP_type_enable_status ACP DIP\t\t%lu\n", BIT(dword, 22));
     printf("AUD_CNTL_ST_C  DIP_type_enable_status Generic 2 DIP\t%lu\n", BIT(dword, 23));
     printf("AUD_CNTL_ST_C  DIP_transmission_frequency\t\t[0x%lx] %s\n",

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH 2/2] intel_audio_dump: show more AUD_CONFIG bits
  2012-01-16 23:18 [PATCH 1/2] intel_audio_dump: fix missing Audio DIP tabs Wu Fengguang
@ 2012-01-16 23:19 ` Wu Fengguang
  2012-01-21 22:06   ` Eugeni Dodonov
  0 siblings, 1 reply; 4+ messages in thread
From: Wu Fengguang @ 2012-01-16 23:19 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: intel-gfx@lists.freedesktop..., Dodonov, Eugeni


Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
 tools/intel_audio_dump.c |   35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

--- intel-gpu-tools.orig/tools/intel_audio_dump.c	2012-01-16 15:33:18.000000000 +0800
+++ intel-gpu-tools/tools/intel_audio_dump.c	2012-01-16 16:13:08.000000000 +0800
@@ -168,6 +168,11 @@ static const char *sdvo_hdmi_encoding[] 
 	[3] = "reserved",
 };
 
+static const char *n_index_value[] = {
+	[0] = "HDMI",
+	[1] = "DisplayPort",
+};
+
 static void do_self_tests(void)
 {
     if (BIT(1, 0) != 1)
@@ -627,11 +632,23 @@ static void dump_ironlake(void)
     printf("PCH_DP_D Audio_Output_Enable\t\t\t\t%lu\n", BIT(dword, 6));
 
     dword = INREG(AUD_CONFIG_A);
+    printf("AUD_CONFIG_A  N_index_value\t\t\t\t[0x%lx] %s\n", BIT(dword, 29),
+						n_index_value[BIT(dword, 29)]);
+    printf("AUD_CONFIG_A  N_programming_enable\t\t\t%lu\n", BIT(dword, 28));
+    printf("AUD_CONFIG_A  Upper_N_value\t\t\t\t0x%02lx\n", BITS(dword, 27, 20));
+    printf("AUD_CONFIG_A  Lower_N_value\t\t\t\t0x%03lx\n", BITS(dword, 15, 4));
     printf("AUD_CONFIG_A  Pixel_Clock\t\t\t\t[0x%lx] %s\n", BITS(dword, 19, 16),
 		    OPNAME(pixel_clock, BITS(dword, 19, 16)));
+    printf("AUD_CONFIG_A  Disable_NCTS\t\t\t\t%lu\n", BIT(dword, 3));
     dword = INREG(AUD_CONFIG_B);
+    printf("AUD_CONFIG_B  N_index_value\t\t\t\t[0x%lx] %s\n", BIT(dword, 29),
+						n_index_value[BIT(dword, 29)]);
+    printf("AUD_CONFIG_B  N_programming_enable\t\t\t%lu\n", BIT(dword, 28));
+    printf("AUD_CONFIG_B  Upper_N_value\t\t\t\t0x%02lx\n", BITS(dword, 27, 20));
+    printf("AUD_CONFIG_B  Lower_N_value\t\t\t\t0x%03lx\n", BITS(dword, 15, 4));
     printf("AUD_CONFIG_B  Pixel_Clock\t\t\t\t[0x%lx] %s\n", BITS(dword, 19, 16),
 		    OPNAME(pixel_clock, BITS(dword, 19, 16)));
+    printf("AUD_CONFIG_B  Disable_NCTS\t\t\t\t%lu\n", BIT(dword, 3));
 
     dword = INREG(AUD_CTS_ENABLE_A);
     printf("AUD_CTS_ENABLE_A  Enable_CTS_or_M_programming\t\t%lu\n", BIT(dword, 20));
@@ -1063,14 +1080,32 @@ static void dump_cpt(void)
     printf("DP_CTL_D Audio_Output_Enable\t\t\t\t%lu\n", BIT(dword, 6));
 
     dword = INREG(AUD_CONFIG_A);
+    printf("AUD_CONFIG_A  N_index_value\t\t\t\t[0x%lx] %s\n", BIT(dword, 29),
+						n_index_value[BIT(dword, 29)]);
+    printf("AUD_CONFIG_A  N_programming_enable\t\t\t%lu\n", BIT(dword, 28));
+    printf("AUD_CONFIG_A  Upper_N_value\t\t\t\t0x%02lx\n", BITS(dword, 27, 20));
+    printf("AUD_CONFIG_A  Lower_N_value\t\t\t\t0x%03lx\n", BITS(dword, 15, 4));
     printf("AUD_CONFIG_A  Pixel_Clock_HDMI\t\t\t\t[0x%lx] %s\n", BITS(dword, 19, 16),
 		    OPNAME(pixel_clock, BITS(dword, 19, 16)));
+    printf("AUD_CONFIG_A  Disable_NCTS\t\t\t\t%lu\n", BIT(dword, 3));
     dword = INREG(AUD_CONFIG_B);
+    printf("AUD_CONFIG_B  N_index_value\t\t\t\t[0x%lx] %s\n", BIT(dword, 29),
+						n_index_value[BIT(dword, 29)]);
+    printf("AUD_CONFIG_B  N_programming_enable\t\t\t%lu\n", BIT(dword, 28));
+    printf("AUD_CONFIG_B  Upper_N_value\t\t\t\t0x%02lx\n", BITS(dword, 27, 20));
+    printf("AUD_CONFIG_B  Lower_N_value\t\t\t\t0x%03lx\n", BITS(dword, 15, 4));
     printf("AUD_CONFIG_B  Pixel_Clock_HDMI\t\t\t\t[0x%lx] %s\n", BITS(dword, 19, 16),
 		    OPNAME(pixel_clock, BITS(dword, 19, 16)));
+    printf("AUD_CONFIG_B  Disable_NCTS\t\t\t\t%lu\n", BIT(dword, 3));
     dword = INREG(AUD_CONFIG_C);
+    printf("AUD_CONFIG_C  N_index_value\t\t\t\t[0x%lx] %s\n", BIT(dword, 29),
+						n_index_value[BIT(dword, 29)]);
+    printf("AUD_CONFIG_C  N_programming_enable\t\t\t%lu\n", BIT(dword, 28));
+    printf("AUD_CONFIG_C  Upper_N_value\t\t\t\t0x%02lx\n", BITS(dword, 27, 20));
+    printf("AUD_CONFIG_C  Lower_N_value\t\t\t\t0x%03lx\n", BITS(dword, 15, 4));
     printf("AUD_CONFIG_C  Pixel_Clock_HDMI\t\t\t\t[0x%lx] %s\n", BITS(dword, 19, 16),
 		    OPNAME(pixel_clock, BITS(dword, 19, 16)));
+    printf("AUD_CONFIG_C  Disable_NCTS\t\t\t\t%lu\n", BIT(dword, 3));
 
     dword = INREG(AUD_CTS_ENABLE_A);
     printf("AUD_CTS_ENABLE_A  Enable_CTS_or_M_programming\t\t%lu\n", BIT(dword, 20));

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] intel_audio_dump: show more AUD_CONFIG bits
  2012-01-16 23:19 ` [PATCH 2/2] intel_audio_dump: show more AUD_CONFIG bits Wu Fengguang
@ 2012-01-21 22:06   ` Eugeni Dodonov
  2012-01-21 22:35     ` Daniel Vetter
  0 siblings, 1 reply; 4+ messages in thread
From: Eugeni Dodonov @ 2012-01-21 22:06 UTC (permalink / raw)
  To: Wu Fengguang
  Cc: Daniel Vetter, intel-gfx@lists.freedesktop..., Dodonov, Eugeni


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

On Mon, Jan 16, 2012 at 21:19, Wu Fengguang <fengguang.wu@intel.com> wrote:

>
> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
> ---
>  tools/intel_audio_dump.c |   35 +++++++++++++++++++++++++++++++++++
>  1 file changed, 35 insertions(+)
>

Everything looks fine to me, so:
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>

-- 
Eugeni Dodonov
<http://eugeni.dodonov.net/>

[-- Attachment #1.2: Type: text/html, Size: 805 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] 4+ messages in thread
* Re: [PATCH 2/2] intel_audio_dump: show more AUD_CONFIG bits
  2012-01-21 22:06   ` Eugeni Dodonov
@ 2012-01-21 22:35     ` Daniel Vetter
  0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2012-01-21 22:35 UTC (permalink / raw)
  To: Eugeni Dodonov
  Cc: Daniel Vetter, intel-gfx@lists.freedesktop..., Wu Fengguang,
	Dodonov, Eugeni

On Sat, Jan 21, 2012 at 08:06:38PM -0200, Eugeni Dodonov wrote:
> On Mon, Jan 16, 2012 at 21:19, Wu Fengguang <fengguang.wu@intel.com> wrote:
> 
> >
> > Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
> > ---
> >  tools/intel_audio_dump.c |   35 +++++++++++++++++++++++++++++++++++
> >  1 file changed, 35 insertions(+)
> >
> 
> Everything looks fine to me, so:
> Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>

Slurped into i-g-t, thanks.
-Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-01-21 22:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-16 23:18 [PATCH 1/2] intel_audio_dump: fix missing Audio DIP tabs Wu Fengguang
2012-01-16 23:19 ` [PATCH 2/2] intel_audio_dump: show more AUD_CONFIG bits Wu Fengguang
2012-01-21 22:06   ` Eugeni Dodonov
2012-01-21 22:35     ` Daniel Vetter

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