From: Wu Fengguang <fengguang.wu@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Wu Fengguang <fengguang.wu@intel.com>
Subject: [PATCH 08/18] intel_audio_dump: fix DP control registers for CPT
Date: Sat, 12 Nov 2011 11:12:45 +0800 [thread overview]
Message-ID: <20111112031411.007759310@intel.com> (raw)
In-Reply-To: 20111112031237.321877255@intel.com
[-- Attachment #1: cpt-dp-ctl --]
[-- Type: text/plain, Size: 4269 bytes --]
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
tools/intel_audio_dump.c | 47 +++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 20 deletions(-)
--- intel-gpu-tools.orig/tools/intel_audio_dump.c 2011-11-12 10:19:06.000000000 +0800
+++ intel-gpu-tools/tools/intel_audio_dump.c 2011-11-12 10:28:14.000000000 +0800
@@ -764,6 +764,7 @@ static void dump_ironlake(void)
/*
* CougarPoint registers
*/
+#define DP_CTL_B 0xE4100
#define DP_CTL_C 0xE4200
#define DP_AUX_CTL_C 0xE4210
#define DP_AUX_TST_C 0xE4228
@@ -825,6 +826,12 @@ static void dump_cpt(void)
dump_reg(HDMIB, "sDVO/HDMI Port B Control");
dump_reg(HDMIC, "HDMI Port C Control");
dump_reg(HDMID, "HDMI Port D Control");
+ dump_reg(DP_CTL_B, "DisplayPort B Control");
+ dump_reg(DP_CTL_C, "DisplayPort C Control");
+ dump_reg(DP_CTL_D, "DisplayPort D Control");
+ dump_reg(TRANS_DP_CTL_A, "Transcoder A DisplayPort Control");
+ dump_reg(TRANS_DP_CTL_B, "Transcoder B DisplayPort Control");
+ dump_reg(TRANS_DP_CTL_C, "Transcoder C DisplayPort Control");
dump_reg(AUD_CONFIG_A, "Audio Configuration - Transcoder A");
dump_reg(AUD_CONFIG_B, "Audio Configuration - Transcoder B");
dump_reg(AUD_CONFIG_C, "Audio Configuration - Transcoder C");
@@ -902,29 +909,29 @@ static void dump_cpt(void)
printf("HDMID HDMI_or_DVI_Select\t\t\t\t%s\n", BIT(dword, 9) ? "HDMI" : "DVI");
printf("HDMID Audio_Output_Enable\t\t\t\t%u\n", !!(dword & SDVO_AUDIO_ENABLE));
- dword = INREG(TRANS_DP_CTL_A);
- printf("TRANS_DP_CTL_A DisplayPort_Enable\t\t\t%lu\n", BIT(dword, 31));
- printf("TRANS_DP_CTL_A Port_Width_Selection\t\t\t[0x%lx] %s\n",
+ dword = INREG(DP_CTL_B);
+ printf("DP_CTL_B DisplayPort_Enable\t\t\t\t%lu\n", BIT(dword, 31));
+ printf("DP_CTL_B Port_Width_Selection\t\t\t\t[0x%lx] %s\n",
BITS(dword, 21, 19), dp_port_width[BITS(dword, 21, 19)]);
- printf("TRANS_DP_CTL_A Port_Detected\t\t\t\t%lu\n", BIT(dword, 2));
- printf("TRANS_DP_CTL_A HDCP_Port_Select\t\t\t\t%lu\n", BIT(dword, 5));
- printf("TRANS_DP_CTL_A Audio_Output_Enable\t\t\t%lu\n", BIT(dword, 6));
-
- dword = INREG(TRANS_DP_CTL_B);
- printf("TRANS_DP_CTL_B DisplayPort_Enable\t\t\t%lu\n", BIT(dword, 31));
- printf("TRANS_DP_CTL_B Port_Width_Selection\t\t\t[0x%lx] %s\n",
+ printf("DP_CTL_B Port_Detected\t\t\t\t\t%lu\n", BIT(dword, 2));
+ printf("DP_CTL_B HDCP_Port_Select\t\t\t\t%lu\n", BIT(dword, 5));
+ printf("DP_CTL_B Audio_Output_Enable\t\t\t\t%lu\n", BIT(dword, 6));
+
+ dword = INREG(DP_CTL_C);
+ printf("DP_CTL_C DisplayPort_Enable\t\t\t\t%lu\n", BIT(dword, 31));
+ printf("DP_CTL_C Port_Width_Selection\t\t\t\t[0x%lx] %s\n",
BITS(dword, 21, 19), dp_port_width[BITS(dword, 21, 19)]);
- printf("TRANS_DP_CTL_B Port_Detected\t\t\t\t%lu\n", BIT(dword, 2));
- printf("TRANS_DP_CTL_B HDCP_Port_Select\t\t\t\t%lu\n", BIT(dword, 5));
- printf("TRANS_DP_CTL_B Audio_Output_Enable\t\t\t%lu\n", BIT(dword, 6));
-
- dword = INREG(TRANS_DP_CTL_C);
- printf("TRANS_DP_CTL_C DisplayPort_Enable\t\t\t%lu\n", BIT(dword, 31));
- printf("TRANS_DP_CTL_C Port_Width_Selection\t\t\t[0x%lx] %s\n",
+ printf("DP_CTL_C Port_Detected\t\t\t\t\t%lu\n", BIT(dword, 2));
+ printf("DP_CTL_C HDCP_Port_Select\t\t\t\t%lu\n", BIT(dword, 5));
+ printf("DP_CTL_C Audio_Output_Enable\t\t\t\t%lu\n", BIT(dword, 6));
+
+ dword = INREG(DP_CTL_D);
+ printf("DP_CTL_D DisplayPort_Enable\t\t\t\t%lu\n", BIT(dword, 31));
+ printf("DP_CTL_D Port_Width_Selection\t\t\t\t[0x%lx] %s\n",
BITS(dword, 21, 19), dp_port_width[BITS(dword, 21, 19)]);
- printf("TRANS_DP_CTL_C Port_Detected\t\t\t\t%lu\n", BIT(dword, 2));
- printf("TRANS_DP_CTL_C HDCP_Port_Select\t\t\t\t%lu\n", BIT(dword, 5));
- printf("TRANS_DP_CTL_C Audio_Output_Enable\t\t\t%lu\n", BIT(dword, 6));
+ printf("DP_CTL_D Port_Detected\t\t\t\t\t%lu\n", BIT(dword, 2));
+ printf("DP_CTL_D HDCP_Port_Select\t\t\t\t%lu\n", BIT(dword, 5));
+ 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 Pixel_Clock_HDMI\t\t\t\t[0x%lx] %s\n", BITS(dword, 19, 16),
next prev parent reply other threads:[~2011-11-12 3:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-12 3:12 [PATCH 00/18] intel-gpu-tools: intel_audio_dump updates Wu Fengguang
2011-11-12 3:12 ` [PATCH 01/18] intel_audio_dump: cleanup hyphen character Wu Fengguang
2011-11-12 3:12 ` [PATCH 02/18] intel_audio_dump: cleanup ACP DIP name for ironlake and CPT Wu Fengguang
2011-11-12 3:12 ` [PATCH 03/18] intel_audio_dump: cleanup hex output Wu Fengguang
2011-11-12 3:12 ` [PATCH 04/18] intel_audio_dump: report effective channel count Wu Fengguang
2011-11-12 3:12 ` [PATCH 05/18] intel_audio_dump: fix ironlake Stream_ID indents Wu Fengguang
2011-11-12 3:12 ` [PATCH 06/18] intel_audio_dump: fix Digital_Port_D_Detected copy&paste error Wu Fengguang
2011-11-12 3:12 ` [PATCH 07/18] intel_audio_dump: fix Ironlake detection Wu Fengguang
2011-11-12 3:12 ` Wu Fengguang [this message]
2011-11-12 3:12 ` [PATCH 09/18] intel_audio_dump: fix DP port width for CPT Wu Fengguang
2011-11-12 3:12 ` [PATCH 10/18] intel_audio_dump: explain Bits_per_Sample Wu Fengguang
2011-11-12 3:12 ` [PATCH 11/18] intel_audio_dump: show DP control registers for Ironlake Wu Fengguang
2011-11-12 3:12 ` [PATCH 12/18] intel_audio_dump: show detected chipset name Wu Fengguang
2011-11-12 3:12 ` [PATCH 13/18] intel_audio_dump: show ELD contents for G45 Wu Fengguang
2011-11-12 3:12 ` [PATCH 14/18] intel_audio_dump: show ironlake ELD_access_address Wu Fengguang
2011-11-12 3:12 ` [PATCH 15/18] intel_audio_dump: show VIDEO_DIP_CTL_* for CPT Wu Fengguang
2011-11-12 3:12 ` [PATCH 16/18] intel_audio_dump: show HDMI encoding Wu Fengguang
2011-11-12 3:12 ` [PATCH 17/18] intel_audio_dump: show interrupt enable bit Wu Fengguang
2011-11-12 3:12 ` [PATCH 18/18] intel_audio_dump: show Gamut Metadata DIP Wu Fengguang
2011-11-12 7:13 ` [PATCH 00/18] intel-gpu-tools: intel_audio_dump updates Paul Menzel
2011-11-12 7:16 ` intel-gpu-tools: Please release new version (was: [PATCH 00/18] intel-gpu-tools: intel_audio_dump updates) Paul Menzel
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=20111112031411.007759310@intel.com \
--to=fengguang.wu@intel.com \
--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
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.