Merge 3.0-rc7 into drm-core-next

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / radeon / evergreend.h

diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h
index b7b2714f0b327d379aa21d2a478b463e067f1bce..7363d9dec909a56f59c04a82e322b567bb6804c9 100644 (file)
--- a/drivers/gpu/drm/radeon/evergreend.h
+++ b/drivers/gpu/drm/radeon/evergreend.h
@@ -351,6 +351,7 @@
 #define                COLOR_BUFFER_SIZE(x)                            ((x) << 0)
 #define                POSITION_BUFFER_SIZE(x)                         ((x) << 8)
 #define                SMX_BUFFER_SIZE(x)                              ((x) << 16)
+#define        SX_MEMORY_EXPORT_BASE                           0x9010
 #define        SX_MISC                                         0x28350
 
 #define CB_PERF_CTR0_SEL_0                             0x9A20
@@ -1122,6 +1123,7 @@
 #define CAYMAN_PA_SC_AA_CONFIG                         0x28BE0
 #define         CAYMAN_MSAA_NUM_SAMPLES_SHIFT           0
 #define         CAYMAN_MSAA_NUM_SAMPLES_MASK            0x7
+#define CAYMAN_SX_SCATTER_EXPORT_BASE                  0x28358
 /* cayman packet3 addition */
 #define        CAYMAN_PACKET3_DEALLOC_STATE                    0x14