summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-11-10 16:55:48 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-11-10 16:55:48 +0000
commit008db9a273f151ac8bec0a0f5f9c2d4207240614 (patch)
tree79b9c4723727bb23d320ac67553be10c86cd1234
parent8cd7e24cdb254487ab0b28bed346d936b4135689 (diff)
Make writeback work on after a suspend. From Dave Airlie via drm git.
-rw-r--r--sys/dev/pci/drm/radeon_cp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/radeon_cp.c b/sys/dev/pci/drm/radeon_cp.c
index a69d33747a5..c5449ffa7ff 100644
--- a/sys/dev/pci/drm/radeon_cp.c
+++ b/sys/dev/pci/drm/radeon_cp.c
@@ -628,9 +628,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
* whenever they are updated.
@@ -1187,6 +1184,9 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
radeon_set_pcigart(dev_priv, 1);
}
+ /* Start with assuming that writeback doesn't work */
+ dev_priv->writeback_works = 0;
+
radeon_cp_load_microcode(dev_priv);
radeon_cp_init_ring_buffer(dev, dev_priv);