diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2006-10-02 05:46:42 +0300 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2006-10-02 22:47:23 +0300 |
| commit | f3deef730d52c94ce21ada7e4ceb63aa28a8601b (patch) | |
| tree | e68d16345e3700c9b173397632a0ff9214e4bd5c /linux-core/drm_bufs.c | |
| parent | 25760c30d4aedb370423d0bb03c014cab47b5d4f (diff) | |
Bug 6242: [mach64] Use private DMA buffers, part #3.
Add DRM_PCI_BUFFER_RO flag for mapping PCI DMA buffer read-only. An additional
flag is needed, since PCI DMA buffers do not have an associated map.
Diffstat (limited to 'linux-core/drm_bufs.c')
| -rw-r--r-- | linux-core/drm_bufs.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index abd7c829..a2a3dbf7 100644 --- a/linux-core/drm_bufs.c +++ b/linux-core/drm_bufs.c @@ -942,6 +942,9 @@ int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request) request->count = entry->buf_count; request->size = size; + if (request->flags & _DRM_PCI_BUFFER_RO) + dma->flags = _DRM_DMA_USE_PCI_RO; + atomic_dec(&dev->buf_alloc); return 0; @@ -1528,9 +1531,10 @@ int drm_freebufs(struct inode *inode, struct file *filp, * \param arg pointer to a drm_buf_map structure. * \return zero on success or a negative number on failure. * - * Maps the AGP or SG buffer region with do_mmap(), and copies information - * about each buffer into user space. The PCI buffers are already mapped on the - * addbufs_pci() call. + * Maps the AGP, SG or PCI buffer region with do_mmap(), and copies information + * about each buffer into user space. For PCI buffers, it calls do_mmap() with + * offset equal to 0, which drm_mmap() interpretes as PCI buffers and calls + * drm_mmap_dma(). */ int drm_mapbufs(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) |