geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging the ati-4-1-0 branch onto the trunk.

main
Gareth Hughes 2000-06-12 15:47:31 +00:00
parent ea425f532f
commit d5348efe25
6 changed files with 95 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
linux-core/r128_drv.c
View File

@ -10,11 +10,11 @@
* the rights to use, copy, modify, merge, publish, distribute, sublicense, * the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the * and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions: * Software is furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice (including the next * The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the * paragraph) shall be included in all copies or substantial portions of the
* Software. * Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -22,10 +22,10 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
* *
* Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com> * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com>
* Kevin E. Martin <kevin@precisioninsight.com> * Kevin E. Martin <kevin@precisioninsight.com>
* *
* $XFree86$ * $XFree86$
* *
*/ */
@ -108,7 +108,7 @@ static drm_ioctl_desc_t r128_ioctls[] = {
[DRM_IOCTL_NR(DRM_IOCTL_R128_RESET)] = { r128_eng_reset, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_R128_RESET)] = { r128_eng_reset, 1, 0 },
[DRM_IOCTL_NR(DRM_IOCTL_R128_FLUSH)] = { r128_eng_flush, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_R128_FLUSH)] = { r128_eng_flush, 1, 0 },
[DRM_IOCTL_NR(DRM_IOCTL_R128_PACKET)] = { r128_submit_pkt, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_R128_PACKET)] = { r128_submit_pkt, 1, 0 },
[DRM_IOCTL_NR(DRM_IOCTL_R128_CCEIDL)] = { r128_cce_idle, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_R128_IDLE)] = { r128_cce_idle, 1, 0 },
[DRM_IOCTL_NR(DRM_IOCTL_R128_VERTEX)] = { r128_vertex_buf, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_R128_VERTEX)] = { r128_vertex_buf, 1, 0 },
}; };
#define R128_IOCTL_COUNT DRM_ARRAY_SIZE(r128_ioctls) #define R128_IOCTL_COUNT DRM_ARRAY_SIZE(r128_ioctls)
@ -144,7 +144,7 @@ void cleanup_module(void)
* *
* This is not currently supported, since it requires changes to * This is not currently supported, since it requires changes to
* linux/init/main.c. */ * linux/init/main.c. */
void __init r128_setup(char *str, int *ints) void __init r128_setup(char *str, int *ints)
{ {
@ -159,7 +159,7 @@ void __init r128_setup(char *str, int *ints)
static int r128_setup(drm_device_t *dev) static int r128_setup(drm_device_t *dev)
{ {
int i; int i;
atomic_set(&dev->ioctl_count, 0); atomic_set(&dev->ioctl_count, 0);
atomic_set(&dev->vma_count, 0); atomic_set(&dev->vma_count, 0);
dev->buf_use = 0; dev->buf_use = 0;
@ -202,7 +202,7 @@ static int r128_setup(drm_device_t *dev)
dev->ctx_start = 0; dev->ctx_start = 0;
dev->lck_start = 0; dev->lck_start = 0;
dev->buf_rp = dev->buf; dev->buf_rp = dev->buf;
dev->buf_wp = dev->buf; dev->buf_wp = dev->buf;
dev->buf_end = dev->buf + DRM_BSZ; dev->buf_end = dev->buf + DRM_BSZ;
@ -211,15 +211,15 @@ static int r128_setup(drm_device_t *dev)
init_waitqueue_head(&dev->buf_writers); init_waitqueue_head(&dev->buf_writers);
r128_res_ctx.handle=-1; r128_res_ctx.handle=-1;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
/* The kernel's context could be created here, but is now created /* The kernel's context could be created here, but is now created
in drm_dma_enqueue. This is more resource-efficient for in drm_dma_enqueue. This is more resource-efficient for
hardware that does not do DMA, but may mean that hardware that does not do DMA, but may mean that
drm_select_queue fails between the time the interrupt is drm_select_queue fails between the time the interrupt is
initialized and the time the queues are initialized. */ initialized and the time the queues are initialized. */
return 0; return 0;
} }
@ -235,12 +235,12 @@ static int r128_takedown(drm_device_t *dev)
down(&dev->struct_sem); down(&dev->struct_sem);
del_timer(&dev->timer); del_timer(&dev->timer);
if (dev->devname) { if (dev->devname) {
drm_free(dev->devname, strlen(dev->devname)+1, DRM_MEM_DRIVER); drm_free(dev->devname, strlen(dev->devname)+1, DRM_MEM_DRIVER);
dev->devname = NULL; dev->devname = NULL;
} }
if (dev->unique) { if (dev->unique) {
drm_free(dev->unique, strlen(dev->unique)+1, DRM_MEM_DRIVER); drm_free(dev->unique, strlen(dev->unique)+1, DRM_MEM_DRIVER);
dev->unique = NULL; dev->unique = NULL;
@ -260,7 +260,7 @@ static int r128_takedown(drm_device_t *dev)
if (dev->agp) { if (dev->agp) {
drm_agp_mem_t *entry; drm_agp_mem_t *entry;
drm_agp_mem_t *nexte; drm_agp_mem_t *nexte;
/* Remove AGP resources, but leave dev->agp /* Remove AGP resources, but leave dev->agp
intact until r128_cleanup is called. */ intact until r128_cleanup is called. */
for (entry = dev->agp->memory; entry; entry = nexte) { for (entry = dev->agp->memory; entry; entry = nexte) {
@ -270,15 +270,15 @@ static int r128_takedown(drm_device_t *dev)
drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS); drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
} }
dev->agp->memory = NULL; dev->agp->memory = NULL;
if (dev->agp->acquired && drm_agp.release) if (dev->agp->acquired && drm_agp.release)
(*drm_agp.release)(); (*drm_agp.release)();
dev->agp->acquired = 0; dev->agp->acquired = 0;
dev->agp->enabled = 0; dev->agp->enabled = 0;
} }
#endif #endif
/* Clear vma list (only built for debugging) */ /* Clear vma list (only built for debugging) */
if (dev->vmalist) { if (dev->vmalist) {
for (vma = dev->vmalist; vma; vma = vma_next) { for (vma = dev->vmalist; vma; vma = vma_next) {
@ -287,7 +287,7 @@ static int r128_takedown(drm_device_t *dev)
} }
dev->vmalist = NULL; dev->vmalist = NULL;
} }
/* Clear map area and mtrr information */ /* Clear map area and mtrr information */
if (dev->maplist) { if (dev->maplist) {
for (i = 0; i < dev->map_count; i++) { for (i = 0; i < dev->map_count; i++) {
@ -325,7 +325,7 @@ static int r128_takedown(drm_device_t *dev)
dev->maplist = NULL; dev->maplist = NULL;
dev->map_count = 0; dev->map_count = 0;
} }
drm_dma_takedown(dev); drm_dma_takedown(dev);
dev->queue_count = 0; dev->queue_count = 0;
@ -335,7 +335,7 @@ static int r128_takedown(drm_device_t *dev)
wake_up_interruptible(&dev->lock.lock_queue); wake_up_interruptible(&dev->lock.lock_queue);
} }
up(&dev->struct_sem); up(&dev->struct_sem);
return 0; return 0;
} }
@ -352,7 +352,7 @@ int r128_init(void)
memset((void *)dev, 0, sizeof(*dev)); memset((void *)dev, 0, sizeof(*dev));
dev->count_lock = SPIN_LOCK_UNLOCKED; dev->count_lock = SPIN_LOCK_UNLOCKED;
sema_init(&dev->struct_sem, 1); sema_init(&dev->struct_sem, 1);
#ifdef MODULE #ifdef MODULE
drm_parse_options(r128); drm_parse_options(r128);
#endif #endif
@ -404,7 +404,7 @@ void r128_cleanup(void)
drm_device_t *dev = &r128_device; drm_device_t *dev = &r128_device;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
drm_proc_cleanup(); drm_proc_cleanup();
if (misc_deregister(&r128_misc)) { if (misc_deregister(&r128_misc)) {
DRM_ERROR("Cannot unload module\n"); DRM_ERROR("Cannot unload module\n");
@ -460,7 +460,7 @@ int r128_open(struct inode *inode, struct file *filp)
{ {
drm_device_t *dev = &r128_device; drm_device_t *dev = &r128_device;
int retcode = 0; int retcode = 0;
DRM_DEBUG("open_count = %d\n", dev->open_count); DRM_DEBUG("open_count = %d\n", dev->open_count);
if (!(retcode = drm_open_helper(inode, filp, dev))) { if (!(retcode = drm_open_helper(inode, filp, dev))) {
MOD_INC_USE_COUNT; MOD_INC_USE_COUNT;
@ -517,7 +517,7 @@ int r128_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
atomic_inc(&dev->ioctl_count); atomic_inc(&dev->ioctl_count);
atomic_inc(&dev->total_ioctl); atomic_inc(&dev->total_ioctl);
++priv->ioctl_count; ++priv->ioctl_count;
DRM_DEBUG("pid = %d, cmd = 0x%02x, nr = 0x%02x, dev 0x%x, auth = %d\n", DRM_DEBUG("pid = %d, cmd = 0x%02x, nr = 0x%02x, dev 0x%x, auth = %d\n",
current->pid, cmd, nr, dev->device, priv->authenticated); current->pid, cmd, nr, dev->device, priv->authenticated);
@ -537,7 +537,7 @@ int r128_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
retcode = (func)(inode, filp, cmd, arg); retcode = (func)(inode, filp, cmd, arg);
} }
} }
atomic_dec(&dev->ioctl_count); atomic_dec(&dev->ioctl_count);
return retcode; return retcode;
} }
@ -574,7 +574,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
if (lock.context < 0 || lock.context >= dev->queue_count) if (lock.context < 0 || lock.context >= dev->queue_count)
return -EINVAL; return -EINVAL;
#endif #endif
if (!ret) { if (!ret) {
#if 0 #if 0
if (_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock) if (_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock)
@ -586,7 +586,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
/* Can't take lock if we just had it and /* Can't take lock if we just had it and
there is contention. */ there is contention. */
DRM_DEBUG("%d (pid %d) delayed j=%d dev=%d jiffies=%d\n", DRM_DEBUG("%d (pid %d) delayed j=%d dev=%d jiffies=%d\n",
lock.context, current->pid, j, lock.context, current->pid, j,
dev->lock.lock_time, jiffies); dev->lock.lock_time, jiffies);
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
current->policy |= SCHED_YIELD; current->policy |= SCHED_YIELD;
@ -609,7 +609,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
atomic_inc(&dev->total_locks); atomic_inc(&dev->total_locks);
break; /* Got lock */ break; /* Got lock */
} }
/* Contention */ /* Contention */
atomic_inc(&dev->total_sleeps); atomic_inc(&dev->total_sleeps);
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
@ -665,7 +665,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
} }
#if 0 #if 0
DRM_ERROR("pid = %5d, old counter = %5ld\n", DRM_ERROR("pid = %5d, old counter = %5ld\n",
current->pid, current->counter); current->pid, current->counter);
#endif #endif
if (lock.context != r128_res_ctx.handle) { if (lock.context != r128_res_ctx.handle) {
@ -683,7 +683,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
#if DRM_DMA_HISTOGRAM #if DRM_DMA_HISTOGRAM
atomic_inc(&dev->histo.lacq[drm_histogram_slot(get_cycles() - start)]); atomic_inc(&dev->histo.lacq[drm_histogram_slot(get_cycles() - start)]);
#endif #endif
return ret; return ret;
} }
@ -696,7 +696,7 @@ int r128_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
drm_lock_t lock; drm_lock_t lock;
copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT); copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT);
if (lock.context == DRM_KERNEL_CONTEXT) { if (lock.context == DRM_KERNEL_CONTEXT) {
DRM_ERROR("Process %d using kernel context %d\n", DRM_ERROR("Process %d using kernel context %d\n",
current->pid, lock.context); current->pid, lock.context);
@ -732,6 +732,6 @@ int r128_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
schedule_timeout(10); schedule_timeout(10);
#endif #endif
return 0; return 0;
} }

8
linux/drm.h
View File

@ -11,11 +11,11 @@
* the rights to use, copy, modify, merge, publish, distribute, sublicense, * the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the * and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions: * Software is furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice (including the next * The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the * paragraph) shall be included in all copies or substantial portions of the
* Software. * Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -62,7 +62,7 @@ typedef unsigned int drm_context_t;
typedef unsigned int drm_drawable_t; typedef unsigned int drm_drawable_t;
typedef unsigned int drm_magic_t; typedef unsigned int drm_magic_t;
/* Warning: If you change this structure, make sure you change /* Warning: If you change this structure, make sure you change
* XF86DRIClipRectRec in the server as well */ * XF86DRIClipRectRec in the server as well */
typedef struct drm_clip_rect { typedef struct drm_clip_rect {
@ -358,7 +358,7 @@ typedef struct drm_agp_info {
#define DRM_IOCTL_R128_INIT DRM_IOW( 0x40, drm_r128_init_t) #define DRM_IOCTL_R128_INIT DRM_IOW( 0x40, drm_r128_init_t)
#define DRM_IOCTL_R128_RESET DRM_IO( 0x41) #define DRM_IOCTL_R128_RESET DRM_IO( 0x41)
#define DRM_IOCTL_R128_FLUSH DRM_IO( 0x42) #define DRM_IOCTL_R128_FLUSH DRM_IO( 0x42)
#define DRM_IOCTL_R128_CCEIDL DRM_IO( 0x43) #define DRM_IOCTL_R128_IDLE DRM_IO( 0x43)
#define DRM_IOCTL_R128_PACKET DRM_IOW( 0x44, drm_r128_packet_t) #define DRM_IOCTL_R128_PACKET DRM_IOW( 0x44, drm_r128_packet_t)
#define DRM_IOCTL_R128_VERTEX DRM_IOW( 0x45, drm_r128_vertex_t) #define DRM_IOCTL_R128_VERTEX DRM_IOW( 0x45, drm_r128_vertex_t)

23
linux/r128_dma.c
View File

@ -10,11 +10,11 @@
* the rights to use, copy, modify, merge, publish, distribute, sublicense, * the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the * and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions: * Software is furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice (including the next * The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the * paragraph) shall be included in all copies or substantial portions of the
* Software. * Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -22,9 +22,9 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
* *
* Authors: Kevin E. Martin <kevin@precisioninsight.com> * Authors: Kevin E. Martin <kevin@precisioninsight.com>
* *
* $XFree86$ * $XFree86$
* *
*/ */
@ -88,6 +88,20 @@ static void r128_flush_write_combine(void)
"pop %%eax" : /* no outputs */ : /* no inputs */ ); "pop %%eax" : /* no outputs */ : /* no inputs */ );
} }
static void r128_status(drm_device_t *dev)
{
drm_r128_private_t *dev_priv = dev->dev_private;
printk("GUI_STAT = 0x%08x\n",
(unsigned int)R128_READ(R128_GUI_STAT));
printk("PM4_STAT = 0x%08x\n",
(unsigned int)R128_READ(R128_PM4_STAT));
printk("PM4_BUFFER_DL_WPTR = 0x%08x\n",
(unsigned int)R128_READ(R128_PM4_BUFFER_DL_WPTR));
printk("PM4_BUFFER_DL_RPTR = 0x%08x\n",
(unsigned int)R128_READ(R128_PM4_BUFFER_DL_RPTR));
}
static int r128_do_cleanup_cce(drm_device_t *dev) static int r128_do_cleanup_cce(drm_device_t *dev)
{ {
if (dev->dev_private) { if (dev->dev_private) {
@ -828,6 +842,7 @@ static drm_buf_t *r128_freelist_get(drm_device_t *dev)
udelay(1); udelay(1);
} }
r128_status(dev);
return NULL; return NULL;
} }

64
linux/r128_drv.c
View File

@ -10,11 +10,11 @@
* the rights to use, copy, modify, merge, publish, distribute, sublicense, * the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the * and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions: * Software is furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice (including the next * The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the * paragraph) shall be included in all copies or substantial portions of the
* Software. * Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -22,10 +22,10 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
* *
* Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com> * Authors: Rickard E. (Rik) Faith <faith@precisioninsight.com>
* Kevin E. Martin <kevin@precisioninsight.com> * Kevin E. Martin <kevin@precisioninsight.com>
* *
* $XFree86$ * $XFree86$
* *
*/ */
@ -108,7 +108,7 @@ static drm_ioctl_desc_t r128_ioctls[] = {
[DRM_IOCTL_NR(DRM_IOCTL_R128_RESET)] = { r128_eng_reset, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_R128_RESET)] = { r128_eng_reset, 1, 0 },
[DRM_IOCTL_NR(DRM_IOCTL_R128_FLUSH)] = { r128_eng_flush, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_R128_FLUSH)] = { r128_eng_flush, 1, 0 },
[DRM_IOCTL_NR(DRM_IOCTL_R128_PACKET)] = { r128_submit_pkt, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_R128_PACKET)] = { r128_submit_pkt, 1, 0 },
[DRM_IOCTL_NR(DRM_IOCTL_R128_CCEIDL)] = { r128_cce_idle, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_R128_IDLE)] = { r128_cce_idle, 1, 0 },
[DRM_IOCTL_NR(DRM_IOCTL_R128_VERTEX)] = { r128_vertex_buf, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_R128_VERTEX)] = { r128_vertex_buf, 1, 0 },
}; };
#define R128_IOCTL_COUNT DRM_ARRAY_SIZE(r128_ioctls) #define R128_IOCTL_COUNT DRM_ARRAY_SIZE(r128_ioctls)
@ -144,7 +144,7 @@ void cleanup_module(void)
* *
* This is not currently supported, since it requires changes to * This is not currently supported, since it requires changes to
* linux/init/main.c. */ * linux/init/main.c. */
void __init r128_setup(char *str, int *ints) void __init r128_setup(char *str, int *ints)
{ {
@ -159,7 +159,7 @@ void __init r128_setup(char *str, int *ints)
static int r128_setup(drm_device_t *dev) static int r128_setup(drm_device_t *dev)
{ {
int i; int i;
atomic_set(&dev->ioctl_count, 0); atomic_set(&dev->ioctl_count, 0);
atomic_set(&dev->vma_count, 0); atomic_set(&dev->vma_count, 0);
dev->buf_use = 0; dev->buf_use = 0;
@ -202,7 +202,7 @@ static int r128_setup(drm_device_t *dev)
dev->ctx_start = 0; dev->ctx_start = 0;
dev->lck_start = 0; dev->lck_start = 0;
dev->buf_rp = dev->buf; dev->buf_rp = dev->buf;
dev->buf_wp = dev->buf; dev->buf_wp = dev->buf;
dev->buf_end = dev->buf + DRM_BSZ; dev->buf_end = dev->buf + DRM_BSZ;
@ -211,15 +211,15 @@ static int r128_setup(drm_device_t *dev)
init_waitqueue_head(&dev->buf_writers); init_waitqueue_head(&dev->buf_writers);
r128_res_ctx.handle=-1; r128_res_ctx.handle=-1;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
/* The kernel's context could be created here, but is now created /* The kernel's context could be created here, but is now created
in drm_dma_enqueue. This is more resource-efficient for in drm_dma_enqueue. This is more resource-efficient for
hardware that does not do DMA, but may mean that hardware that does not do DMA, but may mean that
drm_select_queue fails between the time the interrupt is drm_select_queue fails between the time the interrupt is
initialized and the time the queues are initialized. */ initialized and the time the queues are initialized. */
return 0; return 0;
} }
@ -235,12 +235,12 @@ static int r128_takedown(drm_device_t *dev)
down(&dev->struct_sem); down(&dev->struct_sem);
del_timer(&dev->timer); del_timer(&dev->timer);
if (dev->devname) { if (dev->devname) {
drm_free(dev->devname, strlen(dev->devname)+1, DRM_MEM_DRIVER); drm_free(dev->devname, strlen(dev->devname)+1, DRM_MEM_DRIVER);
dev->devname = NULL; dev->devname = NULL;
} }
if (dev->unique) { if (dev->unique) {
drm_free(dev->unique, strlen(dev->unique)+1, DRM_MEM_DRIVER); drm_free(dev->unique, strlen(dev->unique)+1, DRM_MEM_DRIVER);
dev->unique = NULL; dev->unique = NULL;
@ -260,7 +260,7 @@ static int r128_takedown(drm_device_t *dev)
if (dev->agp) { if (dev->agp) {
drm_agp_mem_t *entry; drm_agp_mem_t *entry;
drm_agp_mem_t *nexte; drm_agp_mem_t *nexte;
/* Remove AGP resources, but leave dev->agp /* Remove AGP resources, but leave dev->agp
intact until r128_cleanup is called. */ intact until r128_cleanup is called. */
for (entry = dev->agp->memory; entry; entry = nexte) { for (entry = dev->agp->memory; entry; entry = nexte) {
@ -270,15 +270,15 @@ static int r128_takedown(drm_device_t *dev)
drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS); drm_free(entry, sizeof(*entry), DRM_MEM_AGPLISTS);
} }
dev->agp->memory = NULL; dev->agp->memory = NULL;
if (dev->agp->acquired && drm_agp.release) if (dev->agp->acquired && drm_agp.release)
(*drm_agp.release)(); (*drm_agp.release)();
dev->agp->acquired = 0; dev->agp->acquired = 0;
dev->agp->enabled = 0; dev->agp->enabled = 0;
} }
#endif #endif
/* Clear vma list (only built for debugging) */ /* Clear vma list (only built for debugging) */
if (dev->vmalist) { if (dev->vmalist) {
for (vma = dev->vmalist; vma; vma = vma_next) { for (vma = dev->vmalist; vma; vma = vma_next) {
@ -287,7 +287,7 @@ static int r128_takedown(drm_device_t *dev)
} }
dev->vmalist = NULL; dev->vmalist = NULL;
} }
/* Clear map area and mtrr information */ /* Clear map area and mtrr information */
if (dev->maplist) { if (dev->maplist) {
for (i = 0; i < dev->map_count; i++) { for (i = 0; i < dev->map_count; i++) {
@ -325,7 +325,7 @@ static int r128_takedown(drm_device_t *dev)
dev->maplist = NULL; dev->maplist = NULL;
dev->map_count = 0; dev->map_count = 0;
} }
drm_dma_takedown(dev); drm_dma_takedown(dev);
dev->queue_count = 0; dev->queue_count = 0;
@ -335,7 +335,7 @@ static int r128_takedown(drm_device_t *dev)
wake_up_interruptible(&dev->lock.lock_queue); wake_up_interruptible(&dev->lock.lock_queue);
} }
up(&dev->struct_sem); up(&dev->struct_sem);
return 0; return 0;
} }
@ -352,7 +352,7 @@ int r128_init(void)
memset((void *)dev, 0, sizeof(*dev)); memset((void *)dev, 0, sizeof(*dev));
dev->count_lock = SPIN_LOCK_UNLOCKED; dev->count_lock = SPIN_LOCK_UNLOCKED;
sema_init(&dev->struct_sem, 1); sema_init(&dev->struct_sem, 1);
#ifdef MODULE #ifdef MODULE
drm_parse_options(r128); drm_parse_options(r128);
#endif #endif
@ -404,7 +404,7 @@ void r128_cleanup(void)
drm_device_t *dev = &r128_device; drm_device_t *dev = &r128_device;
DRM_DEBUG("\n"); DRM_DEBUG("\n");
drm_proc_cleanup(); drm_proc_cleanup();
if (misc_deregister(&r128_misc)) { if (misc_deregister(&r128_misc)) {
DRM_ERROR("Cannot unload module\n"); DRM_ERROR("Cannot unload module\n");
@ -460,7 +460,7 @@ int r128_open(struct inode *inode, struct file *filp)
{ {
drm_device_t *dev = &r128_device; drm_device_t *dev = &r128_device;
int retcode = 0; int retcode = 0;
DRM_DEBUG("open_count = %d\n", dev->open_count); DRM_DEBUG("open_count = %d\n", dev->open_count);
if (!(retcode = drm_open_helper(inode, filp, dev))) { if (!(retcode = drm_open_helper(inode, filp, dev))) {
MOD_INC_USE_COUNT; MOD_INC_USE_COUNT;
@ -517,7 +517,7 @@ int r128_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
atomic_inc(&dev->ioctl_count); atomic_inc(&dev->ioctl_count);
atomic_inc(&dev->total_ioctl); atomic_inc(&dev->total_ioctl);
++priv->ioctl_count; ++priv->ioctl_count;
DRM_DEBUG("pid = %d, cmd = 0x%02x, nr = 0x%02x, dev 0x%x, auth = %d\n", DRM_DEBUG("pid = %d, cmd = 0x%02x, nr = 0x%02x, dev 0x%x, auth = %d\n",
current->pid, cmd, nr, dev->device, priv->authenticated); current->pid, cmd, nr, dev->device, priv->authenticated);
@ -537,7 +537,7 @@ int r128_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
retcode = (func)(inode, filp, cmd, arg); retcode = (func)(inode, filp, cmd, arg);
} }
} }
atomic_dec(&dev->ioctl_count); atomic_dec(&dev->ioctl_count);
return retcode; return retcode;
} }
@ -574,7 +574,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
if (lock.context < 0 || lock.context >= dev->queue_count) if (lock.context < 0 || lock.context >= dev->queue_count)
return -EINVAL; return -EINVAL;
#endif #endif
if (!ret) { if (!ret) {
#if 0 #if 0
if (_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock) if (_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock)
@ -586,7 +586,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
/* Can't take lock if we just had it and /* Can't take lock if we just had it and
there is contention. */ there is contention. */
DRM_DEBUG("%d (pid %d) delayed j=%d dev=%d jiffies=%d\n", DRM_DEBUG("%d (pid %d) delayed j=%d dev=%d jiffies=%d\n",
lock.context, current->pid, j, lock.context, current->pid, j,
dev->lock.lock_time, jiffies); dev->lock.lock_time, jiffies);
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
current->policy |= SCHED_YIELD; current->policy |= SCHED_YIELD;
@ -609,7 +609,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
atomic_inc(&dev->total_locks); atomic_inc(&dev->total_locks);
break; /* Got lock */ break; /* Got lock */
} }
/* Contention */ /* Contention */
atomic_inc(&dev->total_sleeps); atomic_inc(&dev->total_sleeps);
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
@ -665,7 +665,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
} }
#if 0 #if 0
DRM_ERROR("pid = %5d, old counter = %5ld\n", DRM_ERROR("pid = %5d, old counter = %5ld\n",
current->pid, current->counter); current->pid, current->counter);
#endif #endif
if (lock.context != r128_res_ctx.handle) { if (lock.context != r128_res_ctx.handle) {
@ -683,7 +683,7 @@ int r128_lock(struct inode *inode, struct file *filp, unsigned int cmd,
#if DRM_DMA_HISTOGRAM #if DRM_DMA_HISTOGRAM
atomic_inc(&dev->histo.lacq[drm_histogram_slot(get_cycles() - start)]); atomic_inc(&dev->histo.lacq[drm_histogram_slot(get_cycles() - start)]);
#endif #endif
return ret; return ret;
} }
@ -696,7 +696,7 @@ int r128_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
drm_lock_t lock; drm_lock_t lock;
copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT); copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT);
if (lock.context == DRM_KERNEL_CONTEXT) { if (lock.context == DRM_KERNEL_CONTEXT) {
DRM_ERROR("Process %d using kernel context %d\n", DRM_ERROR("Process %d using kernel context %d\n",
current->pid, lock.context); current->pid, lock.context);
@ -732,6 +732,6 @@ int r128_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
schedule_timeout(10); schedule_timeout(10);
#endif #endif
return 0; return 0;
} }

8
shared-core/drm.h
View File

@ -11,11 +11,11 @@
* the rights to use, copy, modify, merge, publish, distribute, sublicense, * the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the * and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions: * Software is furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice (including the next * The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the * paragraph) shall be included in all copies or substantial portions of the
* Software. * Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -62,7 +62,7 @@ typedef unsigned int drm_context_t;
typedef unsigned int drm_drawable_t; typedef unsigned int drm_drawable_t;
typedef unsigned int drm_magic_t; typedef unsigned int drm_magic_t;
/* Warning: If you change this structure, make sure you change /* Warning: If you change this structure, make sure you change
* XF86DRIClipRectRec in the server as well */ * XF86DRIClipRectRec in the server as well */
typedef struct drm_clip_rect { typedef struct drm_clip_rect {
@ -358,7 +358,7 @@ typedef struct drm_agp_info {
#define DRM_IOCTL_R128_INIT DRM_IOW( 0x40, drm_r128_init_t) #define DRM_IOCTL_R128_INIT DRM_IOW( 0x40, drm_r128_init_t)
#define DRM_IOCTL_R128_RESET DRM_IO( 0x41) #define DRM_IOCTL_R128_RESET DRM_IO( 0x41)
#define DRM_IOCTL_R128_FLUSH DRM_IO( 0x42) #define DRM_IOCTL_R128_FLUSH DRM_IO( 0x42)
#define DRM_IOCTL_R128_CCEIDL DRM_IO( 0x43) #define DRM_IOCTL_R128_IDLE DRM_IO( 0x43)
#define DRM_IOCTL_R128_PACKET DRM_IOW( 0x44, drm_r128_packet_t) #define DRM_IOCTL_R128_PACKET DRM_IOW( 0x44, drm_r128_packet_t)
#define DRM_IOCTL_R128_VERTEX DRM_IOW( 0x45, drm_r128_vertex_t) #define DRM_IOCTL_R128_VERTEX DRM_IOW( 0x45, drm_r128_vertex_t)

8
shared/drm.h
View File

@ -11,11 +11,11 @@
* the rights to use, copy, modify, merge, publish, distribute, sublicense, * the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the * and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions: * Software is furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice (including the next * The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the * paragraph) shall be included in all copies or substantial portions of the
* Software. * Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -62,7 +62,7 @@ typedef unsigned int drm_context_t;
typedef unsigned int drm_drawable_t; typedef unsigned int drm_drawable_t;
typedef unsigned int drm_magic_t; typedef unsigned int drm_magic_t;
/* Warning: If you change this structure, make sure you change /* Warning: If you change this structure, make sure you change
* XF86DRIClipRectRec in the server as well */ * XF86DRIClipRectRec in the server as well */
typedef struct drm_clip_rect { typedef struct drm_clip_rect {
@ -358,7 +358,7 @@ typedef struct drm_agp_info {
#define DRM_IOCTL_R128_INIT DRM_IOW( 0x40, drm_r128_init_t) #define DRM_IOCTL_R128_INIT DRM_IOW( 0x40, drm_r128_init_t)
#define DRM_IOCTL_R128_RESET DRM_IO( 0x41) #define DRM_IOCTL_R128_RESET DRM_IO( 0x41)
#define DRM_IOCTL_R128_FLUSH DRM_IO( 0x42) #define DRM_IOCTL_R128_FLUSH DRM_IO( 0x42)
#define DRM_IOCTL_R128_CCEIDL DRM_IO( 0x43) #define DRM_IOCTL_R128_IDLE DRM_IO( 0x43)
#define DRM_IOCTL_R128_PACKET DRM_IOW( 0x44, drm_r128_packet_t) #define DRM_IOCTL_R128_PACKET DRM_IOW( 0x44, drm_r128_packet_t)
#define DRM_IOCTL_R128_VERTEX DRM_IOW( 0x45, drm_r128_vertex_t) #define DRM_IOCTL_R128_VERTEX DRM_IOW( 0x45, drm_r128_vertex_t)