intel_audio_dump: add support for Cherryview
PATCH 1/1 intel_audio_dump: add support for Cherryview
From: Libin Yang <[email protected]>
This patch adds support for dumping audio registers of Cherryview.
--- lib/intel_reg.h | 2 ++ tools/intel_audio_dump.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 88 insertions(+), 3 deletions(-)
lib/intel_reg.h +2 -0
@@ -1274,6 +1274,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.#define SDVO_PIPE_B_SELECT (1 << 30)#define SDVO_STALL_SELECT (1 << 29)#define SDVO_INTERRUPT_ENABLE (1 << 26) + +#define DISPLAY_HOTPLUG_CTL 0x61164/* * 915G/GM SDVO pixel multiplier. *
tools/intel_audio_dump.c +86 -3
129 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Maintainers,
Any comments?
Regards,
Libin
Quoted 218 lines
-----Original Message-----
From: Yang, Libin
Sent: Wednesday, January 07, 2015 12:56 PM
To: [email protected]
Cc: Yang, Libin; Lin, Mengdong
Subject: [PATCH]intel_audio_dump: add support for CherryviewFrom: Libin Yang <[email protected]>
This patch adds support for dumping audio registers of Cherryview.
Signed-off-by Libin Yang <[email protected]>--- lib/intel_reg.h | 2 ++ tools/intel_audio_dump.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 88 insertions(+), 3 deletions(-)lib/intel_reg.h +0
-0@@ -1274,6 +1274,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THESOFTWARE.
#defineSDVO_PIPE_B_SELECT(1 << 30)
#defineSDVO_STALL_SELECT(1 << 29)
#defineSDVO_INTERRUPT_ENABLE(1 << 26)lib/intel_reg.h +2
-0+ +#define DISPLAY_HOTPLUG_CTL 0x61164/* * 915G/GM SDVO pixel multiplier. * tools/intel_audio_dump.c index renamed from tools/intel_audio_dump.c +0
-0f3bb9eb..baa42a9 100644
tools/intel_audio_dump.c +0
-0@@ -69,19 +69,19 @@ static int disp_reg_base = 0; /* base address ofdisplay registers */
#definedump_reg(reg, desc)\tools/intel_audio_dump.c +1
-1do { \ dword = INREG(reg); \ - printf("%-21s 0x%08x %s\n", # reg, dword, desc); \ + printf("%-21s(%#x) 0x%08x %s\n", # reg, reg, dword, desc);\tools/intel_audio_dump.c +1
-1} while (0)#define dump_disp_reg (reg, desc) \ do { \ dword = INREG(disp_reg_base + reg); \ - printf("%-21s 0x%08x %s\n", # reg, dword, desc); \ + printf("%-21s(%#x) 0x%08x %s\n", # reg, reg, dword, desc);\tools/intel_audio_dump.c +1
-1} while (0)#define dump_aud_reg (reg, desc) \ do { \ dword = INREG(aud_reg_base + reg); \ - printf("%-21s 0x%08x %s\n", # reg, dword, desc); \ + printf("%-21s(%#x) 0x%08x %s\n", # reg, reg, dword, desc);\tools/intel_audio_dump.c +21
-0} while (0)#define read_aud_reg (reg) INREG(aud_reg_base + (reg))@@ -1771,6 +1771,9 @@ static void dump_aud_hdmi_status(void)#define HDMI_CTL_B 0x1140#define HDMI_CTL_C 0x1150#define HDMI_CTL_D 0x1160 +#define BSW_HDMI_CTL_B 0x1140 +#define BSW_HDMI_CTL_C 0x1160 +#define BSW_HDMI_CTL_D 0x116c/* VLV HDMI port ctrl */ #define SDVO_HDMI_CTL_B 0x1140@@ -2108,6 +2111,10 @@ static void dump_hsw_plus(void)set_aud_reg_base (0x65000 ); +dump_reg (PORT_HOTPLUG_EN ,"port hotplug enable" ); +dump_reg (PORT_HOTPLUG_STAT ,"port hotplug status" ); +dump_reg (DISPLAY_HOTPLUG_CTL ,"display hotplug control" ); +/* HSW DDI Buffer */ dump_reg (DDI_BUF_CTL_A ,"DDI Buffer Controler A" );dump_reg (DDI_BUF_CTL_B ,"DDI Buffer Controler B" );@@ -2267,6 +2274,79 @@ static void dump_hsw_plus(void)printf ("\n" ); } +#define PORT_HOTPLUG_EN_OFFSET 0x1110 +#define PORT_HOTPLUG_STAT_OFFSET 0x1114 #define +DISPLAY_HOTPLUG_CTL_OFFSET 0x1164 static void dump_braswell(void) { +uint32_t dword; + +/* set_aud_reg_base(0x62000 + VLV_DISPLAY_BASE); */ +set_reg_base (0x60000 +VLV_DISPLAY_BASE ,0x2000 ); + + +dump_disp_reg (PORT_HOTPLUG_EN_OFFSET ,"port hotplug enable"); +dump_disp_reg (PORT_HOTPLUG_STAT_OFFSET ,"port hotplug status"); +dump_disp_reg (DISPLAY_HOTPLUG_CTL_OFFSET ,"display hotplug control"); + + dump_disp_reg(BSW_HDMI_CTL_B, "sDVO/HDMI Port BControl");
tools/intel_audio_dump.c +1
-0+dump_disp_reg (BSW_HDMI_CTL_C ,"HDMI Port C Control" );// The address is wrong?
tools/intel_audio_dump.c +8
-0+dump_disp_reg (BSW_HDMI_CTL_D ,"HDMI Port D Control" ); + +dump_disp_reg (DP_CTL_B ,"DisplayPort B Control Register" ); +dump_disp_reg (DP_CTL_C ,"DisplayPort C Control Register" ); +dump_disp_reg (DP_CTL_D ,"DisplayPort D Control Register" ); + +/* HSW North Display Audio */ + dump_aud_reg(AUD_TCA_CONFIG, "Audio Configuration -Transcoder A");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCB_CONFIG, "Audio Configuration -Transcoder B");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCC_CONFIG, "Audio Configuration -Transcoder C");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_C1_MISC_CTRL, "Audio Converter 1 MISCControl");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_C2_MISC_CTRL, "Audio Converter 2 MISCControl");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_C3_MISC_CTRL, "Audio Converter 3 MISCControl");
tools/intel_audio_dump.c +3
-0+dump_aud_reg (AUD_VID_DID ,"Audio Vendor ID / Device ID" ); +dump_aud_reg (AUD_RID ,"Audio Revision ID" ); + dump_aud_reg(AUD_TCA_M_CTS_ENABLE, "Audio M & CTSProgramming Enable - Transcoder A");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCB_M_CTS_ENABLE, "Audio M & CTSProgramming Enable - Transcoder B");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCC_M_CTS_ENABLE, "Audio M & CTSProgramming Enable - Transcoder C");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_PWRST, "Audio Power State (FunctionGroup, Convertor, Pin Widget)");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCA_EDID_DATA, "Audio EDID Data Block -Transcoder A");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCB_EDID_DATA, "Audio EDID Data Block -Transcoder B");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCC_EDID_DATA, "Audio EDID Data Block -Transcoder C");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCA_INFOFR, "Audio Widget Data IslandPacket - Transcoder A");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCB_INFOFR, "Audio Widget Data IslandPacket - Transcoder B");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCC_INFOFR, "Audio Widget Data IslandPacket - Transcoder C");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_PIPE_CONV_CFG, "Audio Pipe andConverter Configs");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_C1_DIG_CNVT, "Audio Digital Converter -Converter 1");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_C2_DIG_CNVT, "Audio Digital Converter -Converter 2");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_C3_DIG_CNVT, "Audio Digital Converter -Converter 3");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_C1_STR_DESC, "Audio Stream DescriptorFormat - Converter 1");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_C2_STR_DESC, "Audio Stream DescriptorFormat - Converter 2");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_C3_STR_DESC, "Audio Stream DescriptorFormat - Converter 3");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_OUT_CHAN_MAP, "Audio Output ChannelMapping");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCA_PIN_PIPE_CONN_ENTRY_LNGTH, "AudioConnection List entry and Length - Transcoder A");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCB_PIN_PIPE_CONN_ENTRY_LNGTH, "AudioConnection List entry and Length - Transcoder B");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCC_PIN_PIPE_CONN_ENTRY_LNGTH, "AudioConnection List entry and Length - Transcoder C");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_PIPE_CONN_SEL_CTRL, "Audio PipeConnection Select Control");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCA_DIP_ELD_CTRL_ST, "Audio DIP and ELDcontrol state - Transcoder A");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCB_DIP_ELD_CTRL_ST, "Audio DIP and ELDcontrol state - Transcoder B");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCC_DIP_ELD_CTRL_ST, "Audio DIP and ELDcontrol state - Transcoder C");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_PIN_ELD_CP_VLD, "Audio pin ELD valid andCP ready status");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_HDMI_FIFO_STATUS, "Audio HDMI FIFOStatus");
tools/intel_audio_dump.c +3
-0+ +/* Audio debug registers */ + dump_aud_reg(AUD_ICOI, "Audio Immediate CommandOutput Interface");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_IRII, "Audio Immediate Response InputInterface");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_ICS, "Audio Immediate CommandStatus");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_CHICKENBIT_REG, "Audio Chicken BitRegister");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_DP_DIP_STATUS, "Audio DP and DIP FIFODebug Status");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCA_M_CTS, "Audio M CTS Read BackTranscoder A");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCB_M_CTS, "Audio M CTS Read BackTranscoder B");
tools/intel_audio_dump.c +1
-0+ dump_aud_reg(AUD_TCC_M_CTS, "Audio M CTS Read BackTranscoder C");
tools/intel_audio_dump.c +7
-1+ +printf ("\n" ); +} +int main (int argc,char **argv) {struct pci_device *pci_dev;@@ -2300,6 +2380,9 @@ int main(int argc, char **argv) }else if (IS_G4X (devid)) {printf ("G45 audio registers:\n\n" );dump_eaglelake (); + }else if (IS_CHERRYVIEW (devid)) { +printf ("Braswell audio registers:\n\n" ); +dump_braswell (); }return 0 ; --
Quoted 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx