summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux-core/drmP.h17
-rw-r--r--linux-core/drm_drv.c3
-rw-r--r--linux-core/drm_memory.h20
-rw-r--r--linux/drmP.h17
-rw-r--r--linux/drm_drv.h3
-rw-r--r--linux/drm_memory.h20
-rw-r--r--linux/gamma_context.h5
-rw-r--r--tests/dristat.c12
8 files changed, 0 insertions, 97 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 8ebd1ec8..08f4faa8 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -447,21 +447,6 @@ typedef struct drm_lock_data {
} drm_lock_data_t;
typedef struct drm_device_dma {
-#if 0
- /* Performance Counters */
- atomic_t total_prio; /* Total DRM_DMA_PRIORITY */
- atomic_t total_bytes; /* Total bytes DMA'd */
- atomic_t total_dmas; /* Total DMA buffers dispatched */
-
- atomic_t total_missed_dma; /* Missed drm_do_dma */
- atomic_t total_missed_lock; /* Missed lock in drm_do_dma */
- atomic_t total_missed_free; /* Missed drm_free_this_buffer */
- atomic_t total_missed_sched;/* Missed drm_dma_schedule */
-
- atomic_t total_tried; /* Tried next_buffer */
- atomic_t total_hit; /* Sent next_buffer */
- atomic_t total_lost; /* Lost interrupt */
-#endif
drm_buf_entry_t bufs[DRM_MAX_ORDER+1];
int buf_count;
@@ -694,8 +679,6 @@ extern int DRM(mem_info)(char *buf, char **start, off_t offset,
extern void *DRM(alloc)(size_t size, int area);
extern void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size,
int area);
-extern char *DRM(strdup)(const char *s, int area);
-extern void DRM(strfree)(const char *s, int area);
extern void DRM(free)(void *pt, size_t size, int area);
extern unsigned long DRM(alloc_pages)(int order, int area);
extern void DRM(free_pages)(unsigned long address, int order,
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index dad961f8..88d27e15 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -815,9 +815,6 @@ int DRM(release)( struct inode *inode, struct file *filp )
break; /* Got lock */
}
/* Contention */
-#if 0
- atomic_inc( &dev->total_sleeps );
-#endif
schedule();
if ( signal_pending( current ) ) {
retcode = -ERESTARTSYS;
diff --git a/linux-core/drm_memory.h b/linux-core/drm_memory.h
index 22aab7f4..138de873 100644
--- a/linux-core/drm_memory.h
+++ b/linux-core/drm_memory.h
@@ -178,26 +178,6 @@ void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size, int area)
return pt;
}
-char *DRM(strdup)(const char *s, int area)
-{
- char *pt;
- int length = s ? strlen(s) : 0;
-
- if (!(pt = DRM(alloc)(length+1, area))) return NULL;
- strcpy(pt, s);
- return pt;
-}
-
-void DRM(strfree)(const char *s, int area)
-{
- unsigned int size;
-
- if (!s) return;
-
- size = 1 + (s ? strlen(s) : 0);
- DRM(free)((void *)s, size, area);
-}
-
void DRM(free)(void *pt, size_t size, int area)
{
int alloc_count;
diff --git a/linux/drmP.h b/linux/drmP.h
index 8ebd1ec8..08f4faa8 100644
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -447,21 +447,6 @@ typedef struct drm_lock_data {
} drm_lock_data_t;
typedef struct drm_device_dma {
-#if 0
- /* Performance Counters */
- atomic_t total_prio; /* Total DRM_DMA_PRIORITY */
- atomic_t total_bytes; /* Total bytes DMA'd */
- atomic_t total_dmas; /* Total DMA buffers dispatched */
-
- atomic_t total_missed_dma; /* Missed drm_do_dma */
- atomic_t total_missed_lock; /* Missed lock in drm_do_dma */
- atomic_t total_missed_free; /* Missed drm_free_this_buffer */
- atomic_t total_missed_sched;/* Missed drm_dma_schedule */
-
- atomic_t total_tried; /* Tried next_buffer */
- atomic_t total_hit; /* Sent next_buffer */
- atomic_t total_lost; /* Lost interrupt */
-#endif
drm_buf_entry_t bufs[DRM_MAX_ORDER+1];
int buf_count;
@@ -694,8 +679,6 @@ extern int DRM(mem_info)(char *buf, char **start, off_t offset,
extern void *DRM(alloc)(size_t size, int area);
extern void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size,
int area);
-extern char *DRM(strdup)(const char *s, int area);
-extern void DRM(strfree)(const char *s, int area);
extern void DRM(free)(void *pt, size_t size, int area);
extern unsigned long DRM(alloc_pages)(int order, int area);
extern void DRM(free_pages)(unsigned long address, int order,
diff --git a/linux/drm_drv.h b/linux/drm_drv.h
index dad961f8..88d27e15 100644
--- a/linux/drm_drv.h
+++ b/linux/drm_drv.h
@@ -815,9 +815,6 @@ int DRM(release)( struct inode *inode, struct file *filp )
break; /* Got lock */
}
/* Contention */
-#if 0
- atomic_inc( &dev->total_sleeps );
-#endif
schedule();
if ( signal_pending( current ) ) {
retcode = -ERESTARTSYS;
diff --git a/linux/drm_memory.h b/linux/drm_memory.h
index 22aab7f4..138de873 100644
--- a/linux/drm_memory.h
+++ b/linux/drm_memory.h
@@ -178,26 +178,6 @@ void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size, int area)
return pt;
}
-char *DRM(strdup)(const char *s, int area)
-{
- char *pt;
- int length = s ? strlen(s) : 0;
-
- if (!(pt = DRM(alloc)(length+1, area))) return NULL;
- strcpy(pt, s);
- return pt;
-}
-
-void DRM(strfree)(const char *s, int area)
-{
- unsigned int size;
-
- if (!s) return;
-
- size = 1 + (s ? strlen(s) : 0);
- DRM(free)((void *)s, size, area);
-}
-
void DRM(free)(void *pt, size_t size, int area)
{
int alloc_count;
diff --git a/linux/gamma_context.h b/linux/gamma_context.h
index 9e4b913f..2338cb38 100644
--- a/linux/gamma_context.h
+++ b/linux/gamma_context.h
@@ -143,16 +143,11 @@ int DRM(context_switch)(drm_device_t *dev, int old, int new)
char buf[64];
drm_queue_t *q;
-#if 0
- atomic_inc(&dev->total_ctx);
-#endif
-
if (test_and_set_bit(0, &dev->context_flag)) {
DRM_ERROR("Reentering -- FIXME\n");
return -EBUSY;
}
-
DRM_DEBUG("Context switch from %d to %d\n", old, new);
if (new >= dev->queue_count) {
diff --git a/tests/dristat.c b/tests/dristat.c
index 47193ab4..07ab54ea 100644
--- a/tests/dristat.c
+++ b/tests/dristat.c
@@ -69,18 +69,6 @@ static void getbusid(int fd)
drmFreeBusid(busid);
}
-#if 0
-typedef struct {
- unsigned long offset; /* Requested physical address (0 for SAREA)*/
- unsigned long size; /* Requested physical size (bytes) */
- drm_map_type_t type; /* Type of memory to map */
- drm_map_flags_t flags; /* Flags */
- void *handle; /* User-space: "Handle" to pass to mmap */
- /* Kernel-space: kernel-virtual address */
- int mtrr; /* MTRR slot used */
- /* Private data */
-} drmVmRec, *drmVmPtr;
-#endif
static void getvm(int fd)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 21:45:39 +0000