drm: Rework vblank-wait handling to allow interrupt reduction.

[deliverable/linux.git] / drivers / gpu / drm / radeon / radeon_cp.c

diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 248ab4a7d39fdb42a1073f48cceca3ed237d28ce..6157cd4bb4369922b0ee1b4f7a2c6820ace18582 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -626,8 +626,6 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
                     dev_priv->ring.size_l2qw);
 #endif
 
-       /* Start with assuming that writeback doesn't work */
-       dev_priv->writeback_works = 0;
 
        /* Initialize the scratch register pointer.  This will cause
         * the scratch register values to be written out to memory
@@ -674,6 +672,9 @@ static void radeon_test_writeback(drm_radeon_private_t * dev_priv)
 {
        u32 tmp;
 
+       /* Start with assuming that writeback doesn't work */
+       dev_priv->writeback_works = 0;
+
        /* Writeback doesn't seem to work everywhere, test it here and possibly
         * enable it if it appears to work
         */
@@ -1286,7 +1287,7 @@ static int radeon_do_resume_cp(struct drm_device * dev)
        radeon_cp_init_ring_buffer(dev, dev_priv);
 
        radeon_do_engine_reset(dev);
-       radeon_enable_interrupt(dev);
+       radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);
 
        DRM_DEBUG("radeon_do_resume_cp() complete\n");