tools/reg_dumper: dump pipe C regs

Also reorder the pipe B regs a bit to be consisten with pipe A.
This commit is contained in:
Daniel Vetter 2012-08-07 14:50:54 +02:00
parent 81f16261f4
commit f56a289aa8
2 changed files with 52 additions and 9 deletions

View File

@ -3006,18 +3006,24 @@ typedef enum {
/* CPU panel fitter */
#define PFA_CTL_1 0x68080
#define PFB_CTL_1 0x68880
#define PFC_CTL_1 0x69080
#define PF_ENABLE (1<<31)
#define PFA_CTL_2 0x68084
#define PFB_CTL_2 0x68884
#define PFC_CTL_2 0x69084
#define PFA_CTL_3 0x68088
#define PFB_CTL_3 0x68888
#define PFC_CTL_3 0x69088
#define PFA_CTL_4 0x68090
#define PFB_CTL_4 0x68890
#define PFC_CTL_4 0x69090
#define PFA_WIN_POS 0x68070
#define PFB_WIN_POS 0x68870
#define PFC_WIN_POS 0x69070
#define PFA_WIN_SIZE 0x68074
#define PFB_WIN_SIZE 0x68874
#define PFC_WIN_SIZE 0x69074
/* legacy palette */
#define LGC_PALETTE_A 0x4a000

View File

@ -1588,6 +1588,8 @@ static struct reg_debug ironlake_debug_regs[] = {
DEFINEREG(FDI_PLL_FREQ_CTL),
/* pipe B */
DEFINEREG2(PIPEACONF, i830_debug_pipeconf),
DEFINEREG2(HTOTAL_A, i830_debug_hvtotal),
@ -1615,6 +1617,8 @@ static struct reg_debug ironlake_debug_regs[] = {
DEFINEREG(DSPASURF),
DEFINEREG2(DSPATILEOFF, i830_debug_xy),
/* pipe B */
DEFINEREG2(PIPEBCONF, i830_debug_pipeconf),
DEFINEREG2(HTOTAL_B, i830_debug_hvtotal),
@ -1624,13 +1628,6 @@ static struct reg_debug ironlake_debug_regs[] = {
DEFINEREG2(VBLANK_B, i830_debug_hvsyncblank),
DEFINEREG2(VSYNC_B, i830_debug_hvsyncblank),
DEFINEREG(VSYNCSHIFT_B),
DEFINEREG2(DSPBCNTR, i830_debug_dspcntr),
DEFINEREG(DSPBBASE),
DEFINEREG2(DSPBSTRIDE, ironlake_debug_dspstride),
DEFINEREG(DSPBSURF),
DEFINEREG2(DSPBTILEOFF, i830_debug_xy),
DEFINEREG2(PIPEBSRC, i830_debug_yxminus1),
DEFINEREG2(PIPEB_DATA_M1, ironlake_debug_m_tu),
@ -1643,6 +1640,12 @@ static struct reg_debug ironlake_debug_regs[] = {
DEFINEREG2(PIPEB_LINK_M2, ironlake_debug_n),
DEFINEREG2(PIPEB_LINK_N2, ironlake_debug_n),
DEFINEREG2(DSPBCNTR, i830_debug_dspcntr),
DEFINEREG(DSPBBASE),
DEFINEREG2(DSPBSTRIDE, ironlake_debug_dspstride),
DEFINEREG(DSPBSURF),
DEFINEREG2(DSPBTILEOFF, i830_debug_xy),
DEFINEREG2(PFA_CTL_1, ironlake_debug_panel_fitting),
DEFINEREG2(PFA_CTL_2, ironlake_debug_panel_fitting_2),
DEFINEREG2(PFA_CTL_3, ironlake_debug_panel_fitting_3),
@ -1655,6 +1658,41 @@ static struct reg_debug ironlake_debug_regs[] = {
DEFINEREG2(PFB_CTL_4, ironlake_debug_panel_fitting_4),
DEFINEREG2(PFB_WIN_POS, ironlake_debug_pf_win),
DEFINEREG2(PFB_WIN_SIZE, ironlake_debug_pf_win),
DEFINEREG2(PFC_CTL_1, ironlake_debug_panel_fitting),
DEFINEREG2(PFC_CTL_2, ironlake_debug_panel_fitting_2),
DEFINEREG2(PFC_CTL_3, ironlake_debug_panel_fitting_3),
DEFINEREG2(PFC_CTL_4, ironlake_debug_panel_fitting_4),
DEFINEREG2(PFC_WIN_POS, ironlake_debug_pf_win),
DEFINEREG2(PFC_WIN_SIZE, ironlake_debug_pf_win),
/* pipe C */
DEFINEREG2(PIPEBCONF, i830_debug_pipeconf),
DEFINEREG2(HTOTAL_B, i830_debug_hvtotal),
DEFINEREG2(HBLANK_B, i830_debug_hvsyncblank),
DEFINEREG2(HSYNC_B, i830_debug_hvsyncblank),
DEFINEREG2(VTOTAL_B, i830_debug_hvtotal),
DEFINEREG2(VBLANK_B, i830_debug_hvsyncblank),
DEFINEREG2(VSYNC_B, i830_debug_hvsyncblank),
DEFINEREG(VSYNCSHIFT_B),
DEFINEREG2(PIPEBSRC, i830_debug_yxminus1),
DEFINEREG2(PIPEB_DATA_M1, ironlake_debug_m_tu),
DEFINEREG2(PIPEB_DATA_N1, ironlake_debug_n),
DEFINEREG2(PIPEB_DATA_M2, ironlake_debug_m_tu),
DEFINEREG2(PIPEB_DATA_N2, ironlake_debug_n),
DEFINEREG2(PIPEB_LINK_M1, ironlake_debug_n),
DEFINEREG2(PIPEB_LINK_N1, ironlake_debug_n),
DEFINEREG2(PIPEB_LINK_M2, ironlake_debug_n),
DEFINEREG2(PIPEB_LINK_N2, ironlake_debug_n),
DEFINEREG2(DSPBCNTR, i830_debug_dspcntr),
DEFINEREG(DSPBBASE),
DEFINEREG2(DSPBSTRIDE, ironlake_debug_dspstride),
DEFINEREG(DSPBSURF),
DEFINEREG2(DSPBTILEOFF, i830_debug_xy),
/* PCH */
@ -2185,8 +2223,7 @@ int main(int argc, char** argv)
if (HAS_PCH_SPLIT(devid)) {
intel_dump_regs(ironlake_debug_regs);
}
else if (IS_945GM(devid)) {
} else if (IS_945GM(devid)) {
intel_dump_regs(i945gm_mi_regs);
intel_dump_regs(intel_debug_regs);
intel_dump_other_regs();