Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next

[mv-sheeva.git] / drivers / gpu / drm / radeon / evergreend.h

diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h
index a73b53c44359c59a617c6c7aed5a8510a40c39d2..94140e142abb4011093640a648fa39afa595e6ba 100644 (file)
--- a/drivers/gpu/drm/radeon/evergreend.h
+++ b/drivers/gpu/drm/radeon/evergreend.h
@@ -164,11 +164,13 @@
 #define                SE_SC_BUSY                                      (1 << 29)
 #define                SE_DB_BUSY                                      (1 << 30)
 #define                SE_CB_BUSY                                      (1 << 31)
-
+/* evergreen */
 #define        CG_MULT_THERMAL_STATUS                          0x740
 #define                ASIC_T(x)                               ((x) << 16)
 #define                ASIC_T_MASK                             0x7FF0000
 #define                ASIC_T_SHIFT                            16
+/* APU */
+#define        CG_THERMAL_STATUS                               0x678
 
 #define        HDP_HOST_PATH_CNTL                              0x2C00
 #define        HDP_NONSURFACE_BASE                             0x2C04
@@ -181,6 +183,7 @@
 #define MC_SHARED_CHMAP                                                0x2004
 #define                NOOFCHAN_SHIFT                                  12
 #define                NOOFCHAN_MASK                                   0x00003000
+#define MC_SHARED_CHREMAP                                      0x2008
 
 #define        MC_ARB_RAMCFG                                   0x2760
 #define                NOOFBANK_SHIFT                                  0
@@ -200,6 +203,7 @@
 #define        MC_VM_AGP_BOT                                   0x202C
 #define        MC_VM_AGP_BASE                                  0x2030
 #define        MC_VM_FB_LOCATION                               0x2024
+#define        MC_FUS_VM_FB_OFFSET                             0x2898
 #define        MC_VM_MB_L1_TLB0_CNTL                           0x2234
 #define        MC_VM_MB_L1_TLB1_CNTL                           0x2238
 #define        MC_VM_MB_L1_TLB2_CNTL                           0x223C
@@ -349,6 +353,9 @@
 #define                SYNC_WALKER                                     (1 << 25)
 #define                SYNC_ALIGNER                                    (1 << 26)
 
+#define        TCP_CHAN_STEER_LO                               0x960c
+#define        TCP_CHAN_STEER_HI                               0x9610
+
 #define        VGT_CACHE_INVALIDATION                          0x88C4
 #define                CACHE_INVALIDATION(x)                           ((x) << 0)
 #define                        VC_ONLY                                         0