diff options
-rw-r--r-- | drivers/char/drm/drmP.h | 5 | ||||
-rw-r--r-- | drivers/char/drm/drm_fops.c | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 255a21783d10..3dc3c9d79ae4 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
@@ -108,7 +108,6 @@ | |||
108 | #define DRM_KERNEL_CONTEXT 0 /**< Change drm_resctx if changed */ | 108 | #define DRM_KERNEL_CONTEXT 0 /**< Change drm_resctx if changed */ |
109 | #define DRM_RESERVED_CONTEXTS 1 /**< Change drm_resctx if changed */ | 109 | #define DRM_RESERVED_CONTEXTS 1 /**< Change drm_resctx if changed */ |
110 | #define DRM_LOOPING_LIMIT 5000000 | 110 | #define DRM_LOOPING_LIMIT 5000000 |
111 | #define DRM_BSZ 1024 /**< Buffer size for /dev/drm? output */ | ||
112 | #define DRM_TIME_SLICE (HZ/20) /**< Time slice for GLXContexts */ | 111 | #define DRM_TIME_SLICE (HZ/20) /**< Time slice for GLXContexts */ |
113 | #define DRM_LOCK_SLICE 1 /**< Time slice for lock, in jiffies */ | 112 | #define DRM_LOCK_SLICE 1 /**< Time slice for lock, in jiffies */ |
114 | 113 | ||
@@ -707,10 +706,6 @@ typedef struct drm_device { | |||
707 | cycles_t ctx_start; | 706 | cycles_t ctx_start; |
708 | cycles_t lck_start; | 707 | cycles_t lck_start; |
709 | 708 | ||
710 | char buf[DRM_BSZ]; /**< Output buffer */ | ||
711 | char *buf_rp; /**< Read pointer */ | ||
712 | char *buf_wp; /**< Write pointer */ | ||
713 | char *buf_end; /**< End pointer */ | ||
714 | struct fasync_struct *buf_async;/**< Processes waiting for SIGIO */ | 709 | struct fasync_struct *buf_async;/**< Processes waiting for SIGIO */ |
715 | wait_queue_head_t buf_readers; /**< Processes waiting to read */ | 710 | wait_queue_head_t buf_readers; /**< Processes waiting to read */ |
716 | wait_queue_head_t buf_writers; /**< Processes waiting to ctx switch */ | 711 | wait_queue_head_t buf_writers; /**< Processes waiting to ctx switch */ |
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c index e0124a9ba14a..bf0a740122bf 100644 --- a/drivers/char/drm/drm_fops.c +++ b/drivers/char/drm/drm_fops.c | |||
@@ -96,9 +96,6 @@ static int drm_setup(drm_device_t * dev) | |||
96 | dev->ctx_start = 0; | 96 | dev->ctx_start = 0; |
97 | dev->lck_start = 0; | 97 | dev->lck_start = 0; |
98 | 98 | ||
99 | dev->buf_rp = dev->buf; | ||
100 | dev->buf_wp = dev->buf; | ||
101 | dev->buf_end = dev->buf + DRM_BSZ; | ||
102 | dev->buf_async = NULL; | 99 | dev->buf_async = NULL; |
103 | init_waitqueue_head(&dev->buf_readers); | 100 | init_waitqueue_head(&dev->buf_readers); |
104 | init_waitqueue_head(&dev->buf_writers); | 101 | init_waitqueue_head(&dev->buf_writers); |