---

yaml --- r: 12149 b: refs/heads/master c: a4e62fa h: refs/heads/master i: 12147: 2d7bc2c v: v3
git-mirror · Oct 24, 2005 · ce8d4f3 · ce8d4f3
1 parent ab9d6d4
commit ce8d4f3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67e1a014fbc0e472ccc55766a63640a767ede3bf
+refs/heads/master: a4e62fa031a9681477207b08391c3a5c5c831ce7
diff --git a/trunk/drivers/char/drm/drmP.h b/trunk/drivers/char/drm/drmP.h
@@ -108,7 +108,6 @@
 #define DRM_KERNEL_CONTEXT    0	 /**< Change drm_resctx if changed */
 #define DRM_RESERVED_CONTEXTS 1	 /**< Change drm_resctx if changed */
 #define DRM_LOOPING_LIMIT     5000000
-#define DRM_BSZ		      1024 /**< Buffer size for /dev/drm? output */
 #define DRM_TIME_SLICE	      (HZ/20)  /**< Time slice for GLXContexts */
 #define DRM_LOCK_SLICE	      1	/**< Time slice for lock, in jiffies */
 
@@ -707,10 +706,6 @@ typedef struct drm_device {
 	cycles_t ctx_start;
 	cycles_t lck_start;
 
-	char buf[DRM_BSZ];		/**< Output buffer */
-	char *buf_rp;			/**< Read pointer */
-	char *buf_wp;			/**< Write pointer */
-	char *buf_end;			/**< End pointer */
 	struct fasync_struct *buf_async;/**< Processes waiting for SIGIO */
 	wait_queue_head_t buf_readers;	/**< Processes waiting to read */
 	wait_queue_head_t buf_writers;	/**< Processes waiting to ctx switch */

diff --git a/trunk/drivers/char/drm/drm_fops.c b/trunk/drivers/char/drm/drm_fops.c
@@ -96,9 +96,6 @@ static int drm_setup(drm_device_t * dev)
 	dev->ctx_start = 0;
 	dev->lck_start = 0;
 
-	dev->buf_rp = dev->buf;
-	dev->buf_wp = dev->buf;
-	dev->buf_end = dev->buf + DRM_BSZ;
 	dev->buf_async = NULL;
 	init_waitqueue_head(&dev->buf_readers);
 	init_waitqueue_head(&dev->buf_writers);