[rfc] drm/radeon/kms: pm debugging check for vbl.

[net-next-2.6.git] / drivers / gpu / drm / radeon / avivod.h

diff --git a/drivers/gpu/drm/radeon/avivod.h b/drivers/gpu/drm/radeon/avivod.h
index e2b92c445baba24a8f650b2636ce2e8405723b0c..3c391e7e9fd41ef2834a668b73afcf8d119a9dff 100644 (file)
--- a/drivers/gpu/drm/radeon/avivod.h
+++ b/drivers/gpu/drm/radeon/avivod.h
@@ -30,11 +30,13 @@
 
 #define        D1CRTC_CONTROL                                  0x6080
 #define                CRTC_EN                                         (1 << 0)
+#define        D1CRTC_STATUS                                   0x609c
 #define        D1CRTC_UPDATE_LOCK                              0x60E8
 #define        D1GRPH_PRIMARY_SURFACE_ADDRESS                  0x6110
 #define        D1GRPH_SECONDARY_SURFACE_ADDRESS                0x6118
 
 #define        D2CRTC_CONTROL                                  0x6880
+#define        D2CRTC_STATUS                                   0x689c
 #define        D2CRTC_UPDATE_LOCK                              0x68E8
 #define        D2GRPH_PRIMARY_SURFACE_ADDRESS                  0x6910
 #define        D2GRPH_SECONDARY_SURFACE_ADDRESS                0x6918
@@ -57,13 +59,4 @@
 #define        VGA_RENDER_CONTROL                              0x0300
 #define                VGA_VSTATUS_CNTL_MASK                           0x00030000
 
-/* AVIVO disable VGA rendering */
-static inline void radeon_avivo_vga_render_disable(struct radeon_device *rdev)
-{
-       u32 vga_render;
-       vga_render = RREG32(VGA_RENDER_CONTROL);
-       vga_render &= ~VGA_VSTATUS_CNTL_MASK;
-       WREG32(VGA_RENDER_CONTROL, vga_render);
-}
-
 #endif