---

yaml --- r: 12142 b: refs/heads/master c: 689b9d7 h: refs/heads/master v: v3
git-mirror · Sep 30, 2005 · f981cb1 · f981cb1
1 parent 94d183d
commit f981cb1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6ce156c415544f900e031890c78eba8bc92f9b3
+refs/heads/master: 689b9d74b1c00e1316fbb7d1e912fe1227fdb1ab
diff --git a/trunk/drivers/char/drm/radeon_cp.c b/trunk/drivers/char/drm/radeon_cp.c
@@ -1205,6 +1205,10 @@ static void radeon_cp_init_ring_buffer(drm_device_t * dev,
 		dev_priv->writeback_works = 0;
 		DRM_DEBUG("writeback test failed\n");
 	}
+	if (radeon_no_wb == 1) {
+		dev_priv->writeback_works = 0;
+		DRM_DEBUG("writeback forced off\n");
+	}
 
 	dev_priv->sarea_priv->last_frame = dev_priv->scratch[0] = 0;
 	RADEON_WRITE(RADEON_LAST_FRAME_REG, dev_priv->sarea_priv->last_frame);

diff --git a/trunk/drivers/char/drm/radeon_drv.c b/trunk/drivers/char/drm/radeon_drv.c
@@ -37,6 +37,11 @@
 
 #include "drm_pciids.h"
 
+int radeon_no_wb;
+
+MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers\n");
+module_param_named(no_wb, radeon_no_wb, int, 0444);
+
 static int postinit(struct drm_device *dev, unsigned long flags)
 {
 	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",

diff --git a/trunk/drivers/char/drm/radeon_drv.h b/trunk/drivers/char/drm/radeon_drv.h
@@ -281,6 +281,7 @@ typedef struct drm_radeon_buf_priv {
 	u32 age;
 } drm_radeon_buf_priv_t;
 
+extern int radeon_no_wb;
 				/* radeon_cp.c */
 extern int radeon_cp_init(DRM_IOCTL_ARGS);
 extern int radeon_cp_start(DRM_IOCTL_ARGS);