flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-11 18:06:13 +00:00
Code Issues Releases Wiki Activity

intel_reg_dumper: handle 3 pipe configs when dumping HDMI config

Browse Source 
Could be on pipe A, B, or C.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Jesse Barnes 2011-10-28 08:53:48 -07:00
parent 234b5c40b1
commit 2b484c16dd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/intel_reg.h
View File

@ -3261,6 +3261,7 @@ typedef enum {
/* CPU: FDI_TX */ /* CPU: FDI_TX */
#define FDI_TXA_CTL 0x60100 #define FDI_TXA_CTL 0x60100
#define FDI_TXB_CTL 0x61100 #define FDI_TXB_CTL 0x61100
#define FDI_TXC_CTL 0x62100
#define FDI_TX_DISABLE (0<<31) #define FDI_TX_DISABLE (0<<31)
#define FDI_TX_ENABLE (1<<31) #define FDI_TX_ENABLE (1<<31)
#define FDI_LINK_TRAIN_PATTERN_1 (0<<28) #define FDI_LINK_TRAIN_PATTERN_1 (0<<28)

10
tools/intel_reg_dumper.c
View File

@ -1319,7 +1319,8 @@ DEBUGSTRING(ironlake_debug_pf_win)
DEBUGSTRING(ironlake_debug_hdmi) DEBUGSTRING(ironlake_debug_hdmi)
{ {
char *enable, pipe, *bpc = NULL, *encoding; int pipe;
char *enable, *bpc = NULL, *encoding;
char *mode, *audio, *vsync, *hsync, *detect; char *mode, *audio, *vsync, *hsync, *detect;
if (val & PORT_ENABLE) if (val & PORT_ENABLE)
@ -1328,9 +1329,9 @@ DEBUGSTRING(ironlake_debug_hdmi)
enable = "disabled"; enable = "disabled";
if (HAS_CPT) if (HAS_CPT)
pipe = (val & (1<<29)) ? 'B' : 'A'; pipe = (val & (3<<29)) >> 29;
else else
pipe = (val & TRANSCODER_B) ? 'B' : 'A'; pipe = (val & TRANSCODER_B) >> 29;
switch (val & (7 << 26)) { switch (val & (7 << 26)) {
case COLOR_FORMAT_8bpc: case COLOR_FORMAT_8bpc:
@ -1372,7 +1373,7 @@ DEBUGSTRING(ironlake_debug_hdmi)
detect = "non-detected"; detect = "non-detected";
snprintf(result, len, "%s pipe %c %s %s %s audio %s %s %s %s", snprintf(result, len, "%s pipe %c %s %s %s audio %s %s %s %s",
enable, pipe, bpc, encoding, mode, audio, vsync, hsync, detect); enable, pipe + 'A', bpc, encoding, mode, audio, vsync, hsync, detect);
} }
DEBUGSTRING(snb_debug_dpll_sel) DEBUGSTRING(snb_debug_dpll_sel)
@ -1627,6 +1628,7 @@ static struct reg_debug ironlake_debug_regs[] = {
DEFINEREG2(FDI_TXA_CTL, ironlake_debug_fdi_tx_ctl), DEFINEREG2(FDI_TXA_CTL, ironlake_debug_fdi_tx_ctl),
DEFINEREG2(FDI_TXB_CTL, ironlake_debug_fdi_tx_ctl), DEFINEREG2(FDI_TXB_CTL, ironlake_debug_fdi_tx_ctl),
DEFINEREG2(FDI_TXC_CTL, ironlake_debug_fdi_tx_ctl),
DEFINEREG2(FDI_RXA_CTL, ironlake_debug_fdi_rx_ctl), DEFINEREG2(FDI_RXA_CTL, ironlake_debug_fdi_rx_ctl),
DEFINEREG2(FDI_RXB_CTL, ironlake_debug_fdi_rx_ctl), DEFINEREG2(FDI_RXB_CTL, ironlake_debug_fdi_rx_ctl),
DEFINEREG2(FDI_RXC_CTL, ironlake_debug_fdi_rx_ctl), DEFINEREG2(FDI_RXC_CTL, ironlake_debug_fdi_rx_ctl),