Fix TMDS register names

3 files changed, 75 insertions, 75 deletions

diff --git a/include/radeon_reg.h b/include/radeon_reg.h
index a375295..82c0e3f 100644
--- a/include/radeon_reg.h
+++ b/include/radeon_reg.h
@@ -3367,7 +3367,7 @@
  *          tiled 4 times but for most cards this will give wrong pictures
  *     UNK6 seems to kill the feed LVDS & DVI
  */
-#define AVIVO_TMDS1_CNTL                    0x7880
+#define AVIVO_TMDSA_CNTL                    0x7880
 #   define AVIVO_TMDS_CNTL_UNK0                 (1 << 0)
 #   define AVIVO_TMDS_CNTL_UNK1                 (1 << 4)
 #   define AVIVO_TMDS_CNTL_UNK2                 (1 << 8)
@@ -3375,11 +3375,11 @@
 #   define AVIVO_TMDS_CNTL_UNK4                 (1 << 16)
 #   define AVIVO_TMDS_CNTL_UNK5                 (1 << 24)
 #   define AVIVO_TMDS_CNTL_UNK6                 (1 << 28)
-#define AVIVO_TMDS1_CRTC_SOURCE				0x7884
+#define AVIVO_TMDSA_CRTC_SOURCE				0x7884
 /* 78a8 appears to be some kind of (reasonably tolerant) clock?
  * 78d0 definitely hits the transmitter, definitely clock. */
 /* MYSTERY1 This appears to control dithering? */
-#define AVIVO_TMDS1_MYSTERY1				0x7894
+#define AVIVO_TMDSA_MYSTERY1				0x7894
 #   define AVIVO_TMDS_MYSTERY1_UNK0             (1 << 0)
 #   define AVIVO_TMDS_MYSTERY1_UNK1             (1 << 4)
 #   define AVIVO_TMDS_MYSTERY1_UNK2             (1 << 8)
@@ -3391,17 +3391,17 @@
 #   define AVIVO_TMDS_MYSTERY1_UNK8_SHIFT       28
 #   define AVIVO_TMDS_MYSTERY1_UNK8_MASK        (0xF << 28)
 #   define AVIVO_TMDS_MYSTERY1_EN               ((1 << 8) | (1 << 12))
-#define AVIVO_TMDS1_MYSTERY2                0x78d8
+#define AVIVO_TMDSA_MYSTERY2                0x78d8
 #   define AVIVO_TMDS_MYSTERY2_EN               ((1 << 24) | (1 << 16) | (1 << 0))
-#define AVIVO_TMDS1_CLOCK_ENABLE            0x7900
-#define AVIVO_TMDS1_CLOCK_CNTL              0x7904
+#define AVIVO_TMDSA_CLOCK_ENABLE            0x7900
+#define AVIVO_TMDSA_CLOCK_CNTL              0x7904
 /* I don't know any of the bits here, only that enabling (1 << 5)
  * without (1 << 4) makes things go utterly mental ... seems to be
  * the transmitter clock again. */
 /* 790c is a clock?
  * 7910 appears to be some kind of control field, again.  (1 << 25)
  * must be enabled to get a signal on my monitor. */
-#define AVIVO_TMDS1_MYSTERY3				0x7910
+#define AVIVO_TMDSA_MYSTERY3				0x7910
 #	define AVIVO_TMDS_MYSTERY3_24				(1 << 24)
 #	define AVIVO_TMDS_MYSTERY3_25				(1 << 25)
 #	define AVIVO_TMDS_MYSTERY3_4				(1 << 4)
@@ -3409,13 +3409,13 @@
 #	define AVIVO_TMDS_MYSTERY3_2				(1 << 2)
 #	define AVIVO_TMDS_MYSTERY3_1				(1 << 1)
 
-#define AVIVO_TMDS2_CNTL					0x7a80
-#define AVIVO_TMDS2_CRTC_SOURCE				0x7a84
-#define AVIVO_TMDS2_MYSTERY1				0x7a94
-#define AVIVO_TMDS2_MYSTERY2				0x7ad8
-#define AVIVO_TMDS2_CLOCK_ENABLE			0x7b00
-#define AVIVO_TMDS2_CLOCK_CNTL				0x7b04
-#define AVIVO_TMDS2_MYSTERY3				0x7b10
+#define AVIVO_LVTMA_CNTL					0x7a80
+#define AVIVO_LVTMA_CRTC_SOURCE				0x7a84
+#define AVIVO_LVTMA_MYSTERY1				0x7a94
+#define AVIVO_LVTMA_MYSTERY2				0x7ad8
+#define AVIVO_LVTMA_CLOCK_ENABLE			0x7b00
+#define AVIVO_LVTMA_CLOCK_CNTL				0x7b04
+#define AVIVO_LVTMA_MYSTERY3				0x7b10
 
 #define AVIVO_LVDS_CNTL						0x7af0
 #	define AVIVO_LVDS_EN					    ((1 << 4))
@@ -3432,8 +3432,8 @@
 #define AVIVO_GPIO_3                        0x7e60
 
 #define AVIVO_TMDS_STATUS					0x7e9c
-#	define AVIVO_TMDS1_CONNECTED				(1 << 0)
-#	define AVIVO_TMDS2_CONNECTED				(1 << 8)
+#	define AVIVO_TMDSA_CONNECTED				(1 << 0)
+#	define AVIVO_LVTMA_CONNECTED				(1 << 8)
 
 /* Cursor registers. */
 #define AVIVO_CURSOR1_CNTL					0x6400
diff --git a/xorg/avivo_output.c b/xorg/avivo_output.c
index 6b62428..c650600 100644
--- a/xorg/avivo_output.c
+++ b/xorg/avivo_output.c
@@ -84,23 +84,23 @@ avivo_output_tmds1_setup(xf86OutputPtr output)
         struct avivo_crtc_private *avivo_crtc = output->crtc->driver_private;
 
         xf86DrvMsg(output->scrn->scrnIndex, X_INFO,
-                   "(TMDS1) %s connector associated to crtc(%d)\n",
+                   "(TMDSA) %s connector associated to crtc(%d)\n",
                    xf86ConnectorGetName(avivo_output->type),
                    avivo_crtc->crtc_number);
-        OUTREG(AVIVO_TMDS1_CRTC_SOURCE, avivo_crtc->crtc_number);
+        OUTREG(AVIVO_TMDSA_CRTC_SOURCE, avivo_crtc->crtc_number);
     }
-    tmp = INREG(AVIVO_TMDS1_MYSTERY3);
+    tmp = INREG(AVIVO_TMDSA_MYSTERY3);
     tmp = (tmp & ~0x3) | 1;
-    OUTREG(AVIVO_TMDS1_MYSTERY3, tmp);
-    OUTREG(AVIVO_TMDS1_CLOCK_CNTL, 0x1F);
-    OUTREG(AVIVO_TMDS1_CNTL, (INREG(AVIVO_TMDS1_CNTL) | 0x1));
+    OUTREG(AVIVO_TMDSA_MYSTERY3, tmp);
+    OUTREG(AVIVO_TMDSA_CLOCK_CNTL, 0x1F);
+    OUTREG(AVIVO_TMDSA_CNTL, (INREG(AVIVO_TMDSA_CNTL) | 0x1));
     OUTREG(0x78D0, 0x1);
-    OUTREG(AVIVO_TMDS1_MYSTERY3, tmp);
-    OUTREG(AVIVO_TMDS1_MYSTERY3, tmp | 0x3);
-    OUTREG(AVIVO_TMDS1_MYSTERY3, tmp);
-    OUTREG(AVIVO_TMDS1_MYSTERY2, 0x1);
-    OUTREG(AVIVO_TMDS1_MYSTERY2, 0x101);
-    OUTREG(AVIVO_TMDS1_MYSTERY2, 0x1);
+    OUTREG(AVIVO_TMDSA_MYSTERY3, tmp);
+    OUTREG(AVIVO_TMDSA_MYSTERY3, tmp | 0x3);
+    OUTREG(AVIVO_TMDSA_MYSTERY3, tmp);
+    OUTREG(AVIVO_TMDSA_MYSTERY2, 0x1);
+    OUTREG(AVIVO_TMDSA_MYSTERY2, 0x101);
+    OUTREG(AVIVO_TMDSA_MYSTERY2, 0x1);
 }
 
 static void
@@ -110,28 +110,28 @@ avivo_output_tmds2_setup(xf86OutputPtr output)
     struct avivo_info *avivo = avivo_get_info(output->scrn);
     unsigned int tmp;
 
-    xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "SETUP TMDS2\n");
+    xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "SETUP LVTMA\n");
     if (output->crtc) {
         struct avivo_crtc_private *avivo_crtc = output->crtc->driver_private;
 
         xf86DrvMsg(output->scrn->scrnIndex, X_INFO,
-                   "(TMDS2) %s connector associated to crtc(%d)\n",
+                   "(LVTMA) %s connector associated to crtc(%d)\n",
                    xf86ConnectorGetName(avivo_output->type),
                    avivo_crtc->crtc_number);
-        OUTREG(AVIVO_TMDS2_CRTC_SOURCE, avivo_crtc->crtc_number);
+        OUTREG(AVIVO_LVTMA_CRTC_SOURCE, avivo_crtc->crtc_number);
     }
-    tmp = INREG(AVIVO_TMDS2_MYSTERY3);
+    tmp = INREG(AVIVO_LVTMA_MYSTERY3);
     tmp = (tmp & ~0x3) | 1;
-    OUTREG(AVIVO_TMDS2_MYSTERY3, tmp);
-    OUTREG(AVIVO_TMDS2_CLOCK_CNTL, 0x1E1F);
-    OUTREG(AVIVO_TMDS2_CNTL, (INREG(AVIVO_TMDS2_CNTL) | 0x1));
+    OUTREG(AVIVO_LVTMA_MYSTERY3, tmp);
+    OUTREG(AVIVO_LVTMA_CLOCK_CNTL, 0x1E1F);
+    OUTREG(AVIVO_LVTMA_CNTL, (INREG(AVIVO_LVTMA_CNTL) | 0x1));
     OUTREG(0x7AD0, 0x1);
-    OUTREG(AVIVO_TMDS2_MYSTERY3, tmp);
-    OUTREG(AVIVO_TMDS2_MYSTERY3, tmp | 0x3);
-    OUTREG(AVIVO_TMDS2_MYSTERY3, tmp);
-    OUTREG(AVIVO_TMDS2_MYSTERY2, 0x1);
-    OUTREG(AVIVO_TMDS2_MYSTERY2, 0x101);
-    OUTREG(AVIVO_TMDS2_MYSTERY2, 0x1);
+    OUTREG(AVIVO_LVTMA_MYSTERY3, tmp);
+    OUTREG(AVIVO_LVTMA_MYSTERY3, tmp | 0x3);
+    OUTREG(AVIVO_LVTMA_MYSTERY3, tmp);
+    OUTREG(AVIVO_LVTMA_MYSTERY2, 0x1);
+    OUTREG(AVIVO_LVTMA_MYSTERY2, 0x101);
+    OUTREG(AVIVO_LVTMA_MYSTERY2, 0x1);
 }
 
 static void
@@ -175,14 +175,14 @@ avivo_output_tmds1_dpms(xf86OutputPtr output, int mode)
 
     switch(mode) {
     case DPMSModeOn:
-        OUTREG(AVIVO_TMDS1_CLOCK_ENABLE, 1);
-        OUTREG(AVIVO_TMDS1_CLOCK_CNTL, 0x1F);
+        OUTREG(AVIVO_TMDSA_CLOCK_ENABLE, 1);
+        OUTREG(AVIVO_TMDSA_CLOCK_CNTL, 0x1F);
         break;
     case DPMSModeStandby:
     case DPMSModeSuspend:
     case DPMSModeOff:
-        OUTREG(AVIVO_TMDS1_CLOCK_CNTL, 0);
-        OUTREG(AVIVO_TMDS1_CLOCK_ENABLE, 0);
+        OUTREG(AVIVO_TMDSA_CLOCK_CNTL, 0);
+        OUTREG(AVIVO_TMDSA_CLOCK_ENABLE, 0);
         break;
     }
 }
@@ -194,14 +194,14 @@ avivo_output_tmds2_dpms(xf86OutputPtr output, int mode)
 
     switch(mode) {
     case DPMSModeOn:
-        OUTREG(AVIVO_TMDS2_CLOCK_ENABLE, 1);
-        OUTREG(AVIVO_TMDS2_CLOCK_CNTL, 0x1F);
+        OUTREG(AVIVO_LVTMA_CLOCK_ENABLE, 1);
+        OUTREG(AVIVO_LVTMA_CLOCK_CNTL, 0x1F);
         break;
     case DPMSModeStandby:
     case DPMSModeSuspend:
     case DPMSModeOff:
-        OUTREG(AVIVO_TMDS2_CLOCK_CNTL, 0);
-        OUTREG(AVIVO_TMDS2_CLOCK_ENABLE, 0);
+        OUTREG(AVIVO_LVTMA_CLOCK_CNTL, 0);
+        OUTREG(AVIVO_LVTMA_CLOCK_ENABLE, 0);
         break;
     }
 }
@@ -214,21 +214,21 @@ avivo_output_lvds_dpms(xf86OutputPtr output, int mode)
 
     switch(mode) {
     case DPMSModeOn:
-        xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "ENABLE TMDS2\n");
+        xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "ENABLE LVTMA\n");
         OUTREG(AVIVO_LVDS_CNTL, AVIVO_LVDS_EN | AVIVO_LVDS_MYSTERY);
-        OUTREG(AVIVO_TMDS2_CLOCK_CNTL, 0x1E1E);
+        OUTREG(AVIVO_LVTMA_CLOCK_CNTL, 0x1E1E);
         break;
     case DPMSModeStandby:
     case DPMSModeSuspend:
     case DPMSModeOff:
-        xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "DISABLE TMDS2\n");
+        xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "DISABLE LVTMA\n");
         OUTREG(AVIVO_LVDS_CNTL, AVIVO_LVDS_MYSTERY);
         do {
             tmp = INREG(0x7AF4);
             usleep(100);
         } while (tmp != 0x800);
-        OUTREG(AVIVO_TMDS2_CLOCK_CNTL, 0);
-        OUTREG(AVIVO_TMDS2_CLOCK_ENABLE, 0);
+        OUTREG(AVIVO_LVTMA_CLOCK_CNTL, 0);
+        OUTREG(AVIVO_LVTMA_CLOCK_ENABLE, 0);
         break;
     }
 }
@@ -442,7 +442,7 @@ avivo_output_exist(ScrnInfoPtr screen_info, xf86ConnectorType type,
         struct avivo_output_private *avivo_output = output->driver_private;
         if (avivo_output->number == number && avivo_output->type == type)
             return TRUE;
-        /* TMDS2 is shared by LFP & DVI-I */
+        /* LVTMA is shared by LFP & DVI-I */
         if (avivo_output->type == XF86ConnectorLFP && number >= 1)
             return TRUE;
         if (type == XF86ConnectorLFP && avivo_output->number >= 1) {
diff --git a/xorg/avivo_state.c b/xorg/avivo_state.c
index c0e8565..6ac1dd7 100644
--- a/xorg/avivo_state.c
+++ b/xorg/avivo_state.c
@@ -161,19 +161,19 @@ avivo_restore_state(ScrnInfoPtr screen_info)
     OUTREG(AVIVO_DAC1_CNTL, state->dac1_cntl);
     OUTREG(AVIVO_DAC1_MYSTERY1, state->dac1_mystery1);
     OUTREG(AVIVO_DAC1_MYSTERY2, state->dac1_mystery2);
-    OUTREG(AVIVO_TMDS1_CNTL, state->tmds1_cntl);
-    OUTREG(AVIVO_TMDS1_MYSTERY1, state->tmds1_mystery1);
-    OUTREG(AVIVO_TMDS1_MYSTERY2, state->tmds1_mystery2);
-    OUTREG(AVIVO_TMDS1_CLOCK_CNTL, state->tmds1_clock_cntl);
-    OUTREG(AVIVO_TMDS1_MYSTERY3, state->tmds1_mystery3);
+    OUTREG(AVIVO_TMDSA_CNTL, state->tmds1_cntl);
+    OUTREG(AVIVO_TMDSA_MYSTERY1, state->tmds1_mystery1);
+    OUTREG(AVIVO_TMDSA_MYSTERY2, state->tmds1_mystery2);
+    OUTREG(AVIVO_TMDSA_CLOCK_CNTL, state->tmds1_clock_cntl);
+    OUTREG(AVIVO_TMDSA_MYSTERY3, state->tmds1_mystery3);
     OUTREG(AVIVO_DAC2_CNTL, state->dac2_cntl);
     OUTREG(AVIVO_DAC2_MYSTERY1, state->dac2_mystery1);
     OUTREG(AVIVO_DAC2_MYSTERY2, state->dac2_mystery2);
-    OUTREG(AVIVO_TMDS2_CNTL, state->tmds2_cntl);
-    OUTREG(AVIVO_TMDS2_MYSTERY1, state->tmds2_mystery1);
-    OUTREG(AVIVO_TMDS2_MYSTERY2, state->tmds2_mystery2);
-    OUTREG(AVIVO_TMDS2_CLOCK_CNTL, state->tmds2_clock_cntl);
-    OUTREG(AVIVO_TMDS2_MYSTERY3, state->tmds2_mystery3);
+    OUTREG(AVIVO_LVTMA_CNTL, state->tmds2_cntl);
+    OUTREG(AVIVO_LVTMA_MYSTERY1, state->tmds2_mystery1);
+    OUTREG(AVIVO_LVTMA_MYSTERY2, state->tmds2_mystery2);
+    OUTREG(AVIVO_LVTMA_CLOCK_CNTL, state->tmds2_clock_cntl);
+    OUTREG(AVIVO_LVTMA_MYSTERY3, state->tmds2_mystery3);
 #ifdef WITH_VGAHW
     vgaHWPtr hwp = VGAHWPTR(screen_info);
     vgaHWUnlock(hwp);
@@ -279,19 +279,19 @@ avivo_save_state(ScrnInfoPtr screen_info)
     state->dac1_mystery1 = INREG(AVIVO_DAC1_MYSTERY1);
     state->dac1_mystery2 = INREG(AVIVO_DAC1_MYSTERY2);
 
-    state->tmds1_cntl = INREG(AVIVO_TMDS1_CNTL);
-    state->tmds1_mystery1 = INREG(AVIVO_TMDS1_MYSTERY1);
-    state->tmds1_mystery2 = INREG(AVIVO_TMDS1_MYSTERY2);
-    state->tmds1_clock_cntl = INREG(AVIVO_TMDS1_CLOCK_CNTL);
-    state->tmds1_mystery3 = INREG(AVIVO_TMDS1_MYSTERY3);
+    state->tmds1_cntl = INREG(AVIVO_TMDSA_CNTL);
+    state->tmds1_mystery1 = INREG(AVIVO_TMDSA_MYSTERY1);
+    state->tmds1_mystery2 = INREG(AVIVO_TMDSA_MYSTERY2);
+    state->tmds1_clock_cntl = INREG(AVIVO_TMDSA_CLOCK_CNTL);
+    state->tmds1_mystery3 = INREG(AVIVO_TMDSA_MYSTERY3);
 
     state->dac2_cntl = INREG(AVIVO_DAC2_CNTL);
     state->dac2_mystery1 = INREG(AVIVO_DAC2_MYSTERY1);
     state->dac2_mystery2 = INREG(AVIVO_DAC2_MYSTERY2);
 
-    state->tmds2_cntl = INREG(AVIVO_TMDS2_CNTL);
-    state->tmds2_mystery1 = INREG(AVIVO_TMDS2_MYSTERY1);
-    state->tmds2_mystery2 = INREG(AVIVO_TMDS2_MYSTERY2);
-    state->tmds2_clock_cntl = INREG(AVIVO_TMDS2_CLOCK_CNTL);
-    state->tmds2_mystery3 = INREG(AVIVO_TMDS2_MYSTERY3);
+    state->tmds2_cntl = INREG(AVIVO_LVTMA_CNTL);
+    state->tmds2_mystery1 = INREG(AVIVO_LVTMA_MYSTERY1);
+    state->tmds2_mystery2 = INREG(AVIVO_LVTMA_MYSTERY2);
+    state->tmds2_clock_cntl = INREG(AVIVO_LVTMA_CLOCK_CNTL);
+    state->tmds2_mystery3 = INREG(AVIVO_LVTMA_MYSTERY3);
 }