diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2013-08-01 11:52:11 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-02 09:20:09 +1000 |
| commit | 254d9ba2b6d1bec8d654c3e9dba240c2a683fcc3 (patch) | |
| tree | 584bf607946e5a632065421ab3f91f388da49cc5 | |
| parent | b9c59ecbba5ec8138657058c598c43cf17638a68 (diff) | |
avivotool: switch to audio registers names provided by AMD
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | avivotool.c | 35 | ||||
| -rw-r--r-- | radeon_reg.h | 35 |
2 files changed, 48 insertions, 22 deletions
diff --git a/avivotool.c b/avivotool.c index dcbf988..8564c75 100644 --- a/avivotool.c +++ b/avivotool.c @@ -1086,12 +1086,18 @@ void eg_cmd_regs(const char *type) if (show_hdmi) { printf("\nAudio clocks:\n"); - SHOW_REG(EVERGREEN_AUDIO_PLL1_MUL); - SHOW_REG(EVERGREEN_AUDIO_PLL1_DIV); - SHOW_REG(EVERGREEN_AUDIO_PLL1_UNK); + SHOW_REG(DCE4_DCCG_AUDIO_DTO_SOURCE); + SHOW_REG(DCE4_DCCG_AUDIO_DTO0_PHASE); + SHOW_REG(DCE4_DCCG_AUDIO_DTO0_MODULE); + SHOW_REG(DCE4_DCCG_AUDIO_DTO0_LOAD); + SHOW_REG(DCE4_DCCG_AUDIO_DTO0_CNTL); + SHOW_REG(DCE4_DCCG_AUDIO_DTO1_PHASE); + SHOW_REG(DCE4_DCCG_AUDIO_DTO1_MODULE); + SHOW_REG(DCE4_DCCG_AUDIO_DTO1_LOAD); + SHOW_REG(DCE4_DCCG_AUDIO_DTO1_CNTL); printf("\nAudio general:\n"); - SHOW_REG(EVERGREEN_AUDIO_ENABLE); + SHOW_REG(DCE4_AZ_HOT_PLUG_CONTROL); printf("\nAudio params:\n"); SHOW_REG(EVERGREEN_AUDIO_VENDOR_ID); @@ -1638,16 +1644,23 @@ void radeon_cmd_regs(const char *type) } if (show_hdmi) { - printf("\nAudio clocks:\n"); - SHOW_REG(R600_AUDIO_PLL1_MUL); - SHOW_REG(R600_AUDIO_PLL1_DIV); - SHOW_REG(R600_AUDIO_PLL2_MUL); - SHOW_REG(R600_AUDIO_PLL2_DIV); - SHOW_REG(R600_AUDIO_CLK_SRCSEL); + if (IS_DISPLAY_DCE3(card_info)) { + printf("\nAudio clocks:\n"); + SHOW_REG(DCE3_DCCG_AUDIO_DTO0_PHASE); + SHOW_REG(DCE3_DCCG_AUDIO_DTO0_MODULE); + SHOW_REG(DCE3_DCCG_AUDIO_DTO0_LOAD); + SHOW_REG(DCE3_DCCG_AUDIO_DTO0_CNTL); + SHOW_REG(DCE3_DCCG_AUDIO_DTO1_PHASE); + SHOW_REG(DCE3_DCCG_AUDIO_DTO1_MODULE); + SHOW_REG(DCE3_DCCG_AUDIO_DTO1_LOAD); + SHOW_REG(DCE3_DCCG_AUDIO_DTO1_CNTL); + SHOW_REG(DCE3_DCCG_AUDIO_DTO_SELECT); + } printf("\nAudio general:\n"); SHOW_REG(R600_AUDIO_ENABLE); - SHOW_REG(R600_AUDIO_TIMING); + SHOW_REG(DCE2_AUDIO_DTO); + SHOW_REG(R600_AUDIO_DTO_SELECT); printf("\nAudio params:\n"); SHOW_REG(R600_AUDIO_VENDOR_ID); diff --git a/radeon_reg.h b/radeon_reg.h index f84c091..1823ca8 100644 --- a/radeon_reg.h +++ b/radeon_reg.h @@ -3006,11 +3006,15 @@ #define AVIVO_ENGINE_STATUS 0x14 /* Audio clocks */ -#define R600_AUDIO_PLL1_MUL 0x0514 -#define R600_AUDIO_PLL1_DIV 0x0518 -#define R600_AUDIO_PLL2_MUL 0x0524 -#define R600_AUDIO_PLL2_DIV 0x0528 -#define R600_AUDIO_CLK_SRCSEL 0x0534 +#define DCE3_DCCG_AUDIO_DTO0_PHASE 0x0514 +#define DCE3_DCCG_AUDIO_DTO0_MODULE 0x0518 +#define DCE3_DCCG_AUDIO_DTO0_LOAD 0x051c +#define DCE3_DCCG_AUDIO_DTO0_CNTL 0x0520 +#define DCE3_DCCG_AUDIO_DTO1_PHASE 0x0524 +#define DCE3_DCCG_AUDIO_DTO1_MODULE 0x0528 +#define DCE3_DCCG_AUDIO_DTO1_LOAD 0x052c +#define DCE3_DCCG_AUDIO_DTO1_CNTL 0x0530 +#define DCE3_DCCG_AUDIO_DTO_SELECT 0x0534 #define R600_MC_VM_FB_LOCATION 0x2180 #define R600_MC_VM_AGP_TOP 0x2184 @@ -3028,7 +3032,9 @@ /* Audio general */ #define R600_AUDIO_ENABLE 0x7300 -#define R600_AUDIO_TIMING 0x7344 +#define DCE32_AZ_HOT_PLUG_CONTROL 0x7300 +#define DCE2_AUDIO_DTO 0x7340 +#define R600_AUDIO_DTO_SELECT 0x7344 /* Allows forcing audio to use specified DTO */ /* Audio params */ #define R600_AUDIO_VENDOR_ID 0x7380 @@ -3076,11 +3082,18 @@ #define RADEON_MC_DEBUG 0x188 #endif -#define EVERGREEN_AUDIO_PLL1_MUL 0x5b0 -#define EVERGREEN_AUDIO_PLL1_DIV 0x5b4 -#define EVERGREEN_AUDIO_PLL1_UNK 0x5bc - -#define EVERGREEN_AUDIO_ENABLE 0x5e78 +/* Audio clocks */ +#define DCE4_DCCG_AUDIO_DTO_SOURCE 0x05ac +#define DCE4_DCCG_AUDIO_DTO0_PHASE 0x05b0 +#define DCE4_DCCG_AUDIO_DTO0_MODULE 0x05b4 +#define DCE4_DCCG_AUDIO_DTO0_LOAD 0x05b8 +#define DCE4_DCCG_AUDIO_DTO0_CNTL 0x05bc +#define DCE4_DCCG_AUDIO_DTO1_PHASE 0x05c0 +#define DCE4_DCCG_AUDIO_DTO1_MODULE 0x05c4 +#define DCE4_DCCG_AUDIO_DTO1_LOAD 0x05c8 +#define DCE4_DCCG_AUDIO_DTO1_CNTL 0x05cc + +#define DCE4_AZ_HOT_PLUG_CONTROL 0x5e78 #define EVERGREEN_AUDIO_VENDOR_ID 0x5ec0 #define EVERGREEN_AUDIO_RATE_BPS_CHANNEL 0x5f00 |