drm: move legacy device members into a substruct.
Subsystems (3)
Dave Airlie
maintainerPATCH 1/1 drm: move legacy device members into a substruct.
From: Dave Airlie <[email protected]>
This is step one towards allocating these on demand for legacy devices.
First group all the legacy struct members into their own structure and include it into the main drm driver structure directly.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/ati_pcigart.c | 4 +- drivers/gpu/drm/drm_bufs.c | 144 +++++++++++++++++----------------- drivers/gpu/drm/drm_context.c | 64 +++++++-------- drivers/gpu/drm/drm_dma.c | 18 ++--- drivers/gpu/drm/drm_drv.c | 62 ++++++++++----- drivers/gpu/drm/drm_fops.c | 10 +-- drivers/gpu/drm/drm_info.c | 4 +- drivers/gpu/drm/drm_ioctl.c | 2 +- drivers/gpu/drm/drm_lock.c | 20 ++--- drivers/gpu/drm/drm_scatter.c | 14 ++-- drivers/gpu/drm/drm_vm.c | 14 ++-- drivers/gpu/drm/i810/i810_dma.c | 22 +++--- drivers/gpu/drm/mga/mga_dma.c | 42 +++++----- drivers/gpu/drm/mga/mga_state.c | 6 +- drivers/gpu/drm/r128/r128_cce.c | 34 ++++---- drivers/gpu/drm/r128/r128_state.c | 18 ++--- drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +- drivers/gpu/drm/radeon/r600_blit.c | 6 +- drivers/gpu/drm/radeon/r600_cp.c | 44 +++++------ drivers/gpu/drm/radeon/radeon_cp.c | 42 +++++----- drivers/gpu/drm/radeon/radeon_state.c | 16 ++-- drivers/gpu/drm/savage/savage_bci.c | 26 +++--- drivers/gpu/drm/savage/savage_state.c | 2 +- drivers/gpu/drm/sis/sis_mm.c | 2 +- drivers/gpu/drm/via/via_mm.c | 2 +- drivers/gpu/drm/via/via_verifier.c | 2 +- include/drm/drmP.h | 93 +++++++++++++--------- include/drm/drm_legacy.h | 2 +- 28 files changed, 379 insertions(+), 338 deletions(-)
drivers/gpu/drm/ati_pcigart.c +2 -2
@@ -58,7 +58,7 @@ static void drm_ati_free_pcigart_table(struct drm_device *dev,int drm_ati_pcigart_cleanup (struct drm_device *dev,struct drm_ati_pcigart_info *gart_info) { -struct drm_sg_mem *entry = dev->sg; +struct drm_sg_mem *entry = dev->legacy.sg;unsigned long pages;int i;int max_pages;
@@ -98,7 +98,7 @@ EXPORT_SYMBOL(drm_ati_pcigart_cleanup);int drm_ati_pcigart_init (struct drm_device *dev,struct drm_ati_pcigart_info *gart_info) {struct drm_local_map *map = &gart_info->mapping; -struct drm_sg_mem *entry = dev->sg; +struct drm_sg_mem *entry = dev->legacy.sg;void *address =NULL ;unsigned long pages;u32 *pci_gart =NULL , page_base, gart_idx;
drivers/gpu/drm/drm_bufs.c +72 -72
441 lines not on this page · raw message
drivers/gpu/drm/drm_context.c +32 -32
209 lines not on this page · raw message
drivers/gpu/drm/drm_dma.c +9 -9
@@ -54,15 +54,15 @@ int drm_legacy_dma_setup(struct drm_device *dev)return 0 ; } - dev->buf_use =0 ; -atomic_set (&dev->buf_alloc,0 ); + dev->legacy.buf_use =0 ; +atomic_set (&dev->legacy.buf_alloc,0 ); - dev->dma =kzalloc (sizeof (*dev->dma),GFP_KERNEL ); -if (!dev->dma) + dev->legacy.dma =kzalloc (sizeof (*dev->legacy.dma),GFP_KERNEL ); +if (!dev->legacy.dma)return -ENOMEM ;for (i =0 ; i <=DRM_MAX_ORDER ; i++) -memset (&dev->dma->bufs[i],0 ,sizeof (dev->dma->bufs[0 ])); +memset (&dev->legacy.dma->bufs[i],0 ,sizeof (dev->legacy.dma->bufs[0 ]));return 0 ; }
@@ -77,7 +77,7 @@ int drm_legacy_dma_setup(struct drm_device *dev)*/ void drm_legacy_dma_takedown (struct drm_device *dev) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;int i, j; if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA) ||
@@ -113,8 +113,8 @@ void drm_legacy_dma_takedown(struct drm_device *dev)kfree (dma->buflist);kfree (dma->pagelist); -kfree (dev->dma); - dev->dma =NULL ; +kfree (dev->legacy.dma); + dev->legacy.dma =NULL ; }/**
@@ -146,7 +146,7 @@ void drm_legacy_free_buffer(struct drm_device *dev, struct drm_buf * buf)void drm_legacy_reclaim_buffers (struct drm_device *dev,struct drm_file *file_priv) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;int i;if (!dma)
drivers/gpu/drm/drm_drv.c +42 -20
122 lines not on this page · raw message
drivers/gpu/drm/drm_fops.c +5 -5
@@ -312,10 +312,10 @@ static void drm_legacy_dev_reinit(struct drm_device *dev)if (drm_core_check_feature (dev,DRIVER_MODESET ))return ; - dev->sigdata.lock =NULL ; + dev->legacy.sigdata.lock =NULL ; - dev->context_flag =0 ; - dev->last_context =0 ; + dev->legacy.context_flag =0 ; + dev->legacy.last_context =0 ; dev->if_version =0 ; }
@@ -427,8 +427,8 @@ int drm_release(struct inode *inode, struct file *filp)*/ mutex_lock (&dev->struct_mutex);if (master->lock.hw_lock) { -if (dev->sigdata.lock == master->lock.hw_lock) - dev->sigdata.lock =NULL ; +if (dev->legacy.sigdata.lock == master->lock.hw_lock) + dev->legacy.sigdata.lock =NULL ; master->lock.hw_lock =NULL ; master->lock.file_priv =NULL ;wake_up_interruptible_all (&master->lock.lock_queue);
drivers/gpu/drm/drm_info.c +2 -2
@@ -86,7 +86,7 @@ int drm_vm_info(struct seq_file *m, void *data)mutex_lock (&dev->struct_mutex);seq_printf (m,"slot offset size type flags address mtrr\n\n" ); i =0 ; -list_for_each_entry (r_list, &dev->maplist, head) { +list_for_each_entry (r_list, &dev->legacy.maplist, head) { map = r_list->map;if (!map)continue ;
@@ -121,7 +121,7 @@ int drm_bufs_info(struct seq_file *m, void *data)int i, seg_pages;mutex_lock (&dev->struct_mutex); - dma = dev->dma; + dma = dev->legacy.dma;if (!dma) {mutex_unlock (&dev->struct_mutex);return 0 ;
drivers/gpu/drm/drm_ioctl.c +1 -1
@@ -179,7 +179,7 @@ static int drm_getmap(struct drm_device *dev, void *data, i =0 ;mutex_lock (&dev->struct_mutex); -list_for_each (list, &dev->maplist) { +list_for_each (list, &dev->legacy.maplist) {if (i == idx) { r_list = list_entry(list, struct drm_map_list, head);break ;
drivers/gpu/drm/drm_lock.c +10 -10
@@ -115,14 +115,14 @@ int drm_legacy_lock(struct drm_device *dev, void *data,* really probably not the correct answer but lets us debug xkb * xserver for now */ if (!file_priv->is_master) { -sigemptyset (&dev->sigmask); -sigaddset (&dev->sigmask,SIGSTOP ); -sigaddset (&dev->sigmask,SIGTSTP ); -sigaddset (&dev->sigmask,SIGTTIN ); -sigaddset (&dev->sigmask,SIGTTOU ); - dev->sigdata.context = lock->context; - dev->sigdata.lock = master->lock.hw_lock; -block_all_signals (drm_notifier, dev, &dev->sigmask); +sigemptyset (&dev->legacy.sigmask); +sigaddset (&dev->legacy.sigmask,SIGSTOP ); +sigaddset (&dev->legacy.sigmask,SIGTSTP ); +sigaddset (&dev->legacy.sigmask,SIGTTIN ); +sigaddset (&dev->legacy.sigmask,SIGTTOU ); + dev->legacy.sigdata.context = lock->context; + dev->legacy.sigdata.lock = master->lock.hw_lock; +block_all_signals (drm_notifier, dev, &dev->legacy.sigmask); }if (dev->driver->dma_quiescent && (lock->flags & _DRM_LOCK_QUIESCENT))
@@ -295,12 +295,12 @@ int drm_legacy_lock_free(struct drm_lock_data *lock_data, unsigned int context)static int drm_notifier (void *priv) {struct drm_device *dev = priv; -struct drm_hw_lock *lock = dev->sigdata.lock; +struct drm_hw_lock *lock = dev->legacy.sigdata.lock;unsigned int old, new, prev;/* Allow signal delivery if lock isn't held */ if (!lock || !_DRM_LOCK_IS_HELD (lock->lock) - ||_DRM_LOCKING_CONTEXT (lock->lock) != dev->sigdata.context) + ||_DRM_LOCKING_CONTEXT (lock->lock) != dev->legacy.sigdata.context)return 1 ;/* Otherwise, set flag to force call to
drivers/gpu/drm/drm_scatter.c +7 -7
@@ -67,10 +67,10 @@ static void drm_sg_cleanup(struct drm_sg_mem * entry)void drm_legacy_sg_cleanup (struct drm_device *dev) { -if (drm_core_check_feature (dev,DRIVER_SG ) && dev->sg && +if (drm_core_check_feature (dev,DRIVER_SG ) && dev->legacy.sg && !drm_core_check_feature (dev,DRIVER_MODESET )) { -drm_sg_cleanup (dev->sg); - dev->sg =NULL ; +drm_sg_cleanup (dev->legacy.sg); + dev->legacy.sg =NULL ; } }#ifdef _LP64
@@ -94,7 +94,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_SG ))return -EINVAL ; -if (dev->sg) +if (dev->legacy.sg)return -EINVAL ; entry =kzalloc (sizeof (*entry),GFP_KERNEL );
@@ -146,7 +146,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *data, request->handle = entry->handle; - dev->sg = entry; + dev->legacy.sg = entry;#if DEBUG_SCATTER /* Verify that each page points to its virtual address, and vice
@@ -207,8 +207,8 @@ int drm_legacy_sg_free(struct drm_device *dev, void *data,if (!drm_core_check_feature (dev,DRIVER_SG ))return -EINVAL ; - entry = dev->sg; - dev->sg =NULL ; + entry = dev->legacy.sg; + dev->legacy.sg =NULL ;if (!entry || entry->handle != request->handle)return -EINVAL ;
drivers/gpu/drm/drm_vm.c +7 -7
@@ -112,7 +112,7 @@ static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)if (!dev->agp || !dev->agp->cant_use_aperture) goto vm_fault_error; -if (drm_ht_find_item (&dev->map_hash, vma->vm_pgoff, &hash)) +if (drm_ht_find_item (&dev->legacy.map_hash, vma->vm_pgoff, &hash)) goto vm_fault_error; r_list = drm_hash_entry(hash, struct drm_map_list, hash);
@@ -244,7 +244,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)* we delete this mappings information. */ found_maps =0 ; -list_for_each_entry (r_list, &dev->maplist, head) { +list_for_each_entry (r_list, &dev->legacy.maplist, head) {if (r_list->map == map) found_maps++; }
@@ -290,7 +290,7 @@ static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) {struct drm_file *priv = vma->vm_file->private_data;struct drm_device *dev = priv->minor->dev; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;unsigned long offset;unsigned long page_nr;struct page *page;
@@ -325,7 +325,7 @@ static int drm_do_vm_sg_fault(struct vm_area_struct *vma, struct vm_fault *vmf)struct drm_local_map *map = vma->vm_private_data;struct drm_file *priv = vma->vm_file->private_data;struct drm_device *dev = priv->minor->dev; -struct drm_sg_mem *entry = dev->sg; +struct drm_sg_mem *entry = dev->legacy.sg;unsigned long offset;unsigned long map_offset;unsigned long page_offset;
@@ -337,7 +337,7 @@ static int drm_do_vm_sg_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return VM_FAULT_SIGBUS ;/* Nothing allocated */ offset = (unsigned long )vmf->virtual_address - vma->vm_start; - map_offset = map->offset - (unsigned long )dev->sg->virtual; + map_offset = map->offset - (unsigned long )dev->legacy.sg->virtual; page_offset = (offset >>PAGE_SHIFT ) + (map_offset >>PAGE_SHIFT ); page = entry->pagelist[page_offset];get_page (page);
@@ -481,7 +481,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)unsigned long length = vma->vm_end - vma->vm_start; dev = priv->minor->dev; - dma = dev->dma; + dma = dev->legacy.dma;DRM_DEBUG ("start = 0x%lx, end = 0x%lx, page offset = 0x%lx\n" , vma->vm_start, vma->vm_end, vma->vm_pgoff);
@@ -562,7 +562,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) )return drm_mmap_dma (filp, vma); -if (drm_ht_find_item (&dev->map_hash, vma->vm_pgoff, &hash)) { +if (drm_ht_find_item (&dev->legacy.map_hash, vma->vm_pgoff, &hash)) {DRM_ERROR ("Could not find map\n" );return -EINVAL ; }
drivers/gpu/drm/i810/i810_dma.c +11 -11
@@ -47,7 +47,7 @@static struct drm_buf *i810_freelist_get (struct drm_device * dev) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;int i;int used;
@@ -198,7 +198,7 @@ static int i810_dma_get_buffer(struct drm_device *dev, drm_i810_dma_t *d,static int i810_dma_cleanup (struct drm_device *dev) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;/* Make sure interrupts are disabled here because the uninstall ioctl * may not have been called from userspace and after dev_private
@@ -280,7 +280,7 @@ static void i810_kernel_lost_context(struct drm_device *dev)static int i810_freelist_init (struct drm_device *dev,drm_i810_private_t *dev_priv) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;int my_idx =24 ;u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx);int i;
@@ -320,7 +320,7 @@ static int i810_dma_initialize(struct drm_device *dev,struct drm_map_list *r_list;memset (dev_priv,0 ,sizeof (drm_i810_private_t)); -list_for_each_entry (r_list, &dev->maplist, head) { +list_for_each_entry (r_list, &dev->legacy.maplist, head) {if (r_list->map && r_list->map->type == _DRM_SHM && r_list->map->flags & _DRM_CONTAINS_LOCK) {
@@ -341,9 +341,9 @@ static int i810_dma_initialize(struct drm_device *dev,DRM_ERROR ("can not find mmio map!\n" );return -EINVAL ; } - dev->agp_buffer_token = init->buffers_offset; - dev->agp_buffer_map =drm_legacy_findmap (dev, init->buffers_offset); -if (!dev->agp_buffer_map) { + dev->legacy.agp_buffer_token = init->buffers_offset; + dev->legacy.agp_buffer_map =drm_legacy_findmap (dev, init->buffers_offset); +if (!dev->legacy.agp_buffer_map) { dev->dev_private = (void *)dev_priv;i810_dma_cleanup (dev);DRM_ERROR ("can not find dma buffer map!\n" );
@@ -851,7 +851,7 @@ static void i810_dma_quiescent(struct drm_device *dev)static int i810_flush_queue (struct drm_device *dev) {drm_i810_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;int i, ret =0 ;RING_LOCALS ;
@@ -884,7 +884,7 @@ static int i810_flush_queue(struct drm_device *dev)void i810_driver_reclaim_buffers (struct drm_device *dev,struct drm_file *file_priv) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;int i;if (!dma)
@@ -924,7 +924,7 @@ static int i810_flush_ioctl(struct drm_device *dev, void *data,static int i810_dma_vertex (struct drm_device *dev,void *data,struct drm_file *file_priv) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;u32 *hw_status = dev_priv->hw_status_page; drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
@@ -1087,7 +1087,7 @@ static void i810_dma_dispatch_mc(struct drm_device *dev, struct drm_buf *buf, instatic int i810_dma_mc (struct drm_device *dev,void *data,struct drm_file *file_priv) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;u32 *hw_status = dev_priv->hw_status_page; drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
drivers/gpu/drm/mga/mga_dma.c +21 -21
124 lines not on this page · raw message
drivers/gpu/drm/mga/mga_state.c +3 -3
@@ -872,7 +872,7 @@ static int mga_dma_swap(struct drm_device *dev, void *data, struct drm_file *filstatic int mga_dma_vertex (struct drm_device *dev,void *data,struct drm_file *file_priv) {drm_mga_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_mga_buf_priv_t *buf_priv;drm_mga_vertex_t *vertex = data;
@@ -907,7 +907,7 @@ static int mga_dma_vertex(struct drm_device *dev, void *data, struct drm_file *fstatic int mga_dma_indices (struct drm_device *dev,void *data,struct drm_file *file_priv) {drm_mga_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_mga_buf_priv_t *buf_priv;drm_mga_indices_t *indices = data;
@@ -941,7 +941,7 @@ static int mga_dma_indices(struct drm_device *dev, void *data, struct drm_file *static int mga_dma_iload (struct drm_device *dev,void *data,struct drm_file *file_priv) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;drm_mga_private_t *dev_priv = dev->dev_private;struct drm_buf *buf;drm_mga_buf_priv_t *buf_priv;
drivers/gpu/drm/r128/r128_cce.c +17 -17
@@ -317,7 +317,7 @@ static void r128_cce_init_ring_buffer(struct drm_device *dev, else#endif ring_start = dev_priv->cce_ring->offset - - (unsigned long )dev->sg->virtual; + (unsigned long )dev->legacy.sg->virtual;R128_WRITE (R128_PM4_BUFFER_OFFSET , ring_start |R128_AGP_OFFSET );
@@ -357,7 +357,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init) dev_priv->is_pci = init->is_pci; -if (dev_priv->is_pci && !dev->sg) { +if (dev_priv->is_pci && !dev->legacy.sg) {DRM_ERROR ("PCI GART memory not allocated!\n" ); dev->dev_private = (void *)dev_priv;r128_do_cleanup_cce (dev);
@@ -481,9 +481,9 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)r128_do_cleanup_cce (dev);return -EINVAL ; } - dev->agp_buffer_token = init->buffers_offset; - dev->agp_buffer_map =drm_legacy_findmap (dev, init->buffers_offset); -if (!dev->agp_buffer_map) { + dev->legacy.agp_buffer_token = init->buffers_offset; + dev->legacy.agp_buffer_map =drm_legacy_findmap (dev, init->buffers_offset); +if (!dev->legacy.agp_buffer_map) {DRM_ERROR ("could not find dma buffer region!\n" ); dev->dev_private = (void *)dev_priv;r128_do_cleanup_cce (dev);
@@ -509,10 +509,10 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)if (!dev_priv->is_pci) {drm_legacy_ioremap_wc (dev_priv->cce_ring, dev);drm_legacy_ioremap_wc (dev_priv->ring_rptr, dev); -drm_legacy_ioremap_wc (dev->agp_buffer_map, dev); +drm_legacy_ioremap_wc (dev->legacy.agp_buffer_map, dev);if (!dev_priv->cce_ring->handle || !dev_priv->ring_rptr->handle || - !dev->agp_buffer_map->handle) { + !dev->legacy.agp_buffer_map->handle) {DRM_ERROR ("Could not ioremap agp regions!\n" ); dev->dev_private = (void *)dev_priv;r128_do_cleanup_cce (dev);
@@ -525,8 +525,8 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init) (void *)(unsigned long )dev_priv->cce_ring->offset; dev_priv->ring_rptr->handle = (void *)(unsigned long )dev_priv->ring_rptr->offset; - dev->agp_buffer_map->handle = - (void *)(unsigned long )dev->agp_buffer_map->offset; + dev->legacy.agp_buffer_map->handle = + (void *)(unsigned long )dev->legacy.agp_buffer_map->offset; }#if __OS_HAS_AGP
@@ -534,7 +534,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init) dev_priv->cce_buffers_offset = dev->agp->base; else#endif - dev_priv->cce_buffers_offset = (unsigned long )dev->sg->virtual; + dev_priv->cce_buffers_offset = (unsigned long )dev->legacy.sg->virtual; dev_priv->ring.start = (u32 *) dev_priv->cce_ring->handle; dev_priv->ring.end = ((u32 *) dev_priv->cce_ring->handle
@@ -606,9 +606,9 @@ int r128_do_cleanup_cce(struct drm_device *dev)drm_legacy_ioremapfree (dev_priv->cce_ring, dev);if (dev_priv->ring_rptr !=NULL )drm_legacy_ioremapfree (dev_priv->ring_rptr, dev); -if (dev->agp_buffer_map !=NULL ) { -drm_legacy_ioremapfree (dev->agp_buffer_map, dev); - dev->agp_buffer_map =NULL ; +if (dev->legacy.agp_buffer_map !=NULL ) { +drm_legacy_ioremapfree (dev->legacy.agp_buffer_map, dev); + dev->legacy.agp_buffer_map =NULL ; } } else#endif
@@ -764,7 +764,7 @@ int r128_fullscreen(struct drm_device *dev, void *data, struct drm_file *file_pr#if 0 static int r128_freelist_init (struct drm_device *dev) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;drm_r128_private_t *dev_priv = dev->dev_private;struct drm_buf *buf;drm_r128_buf_priv_t *buf_priv;
@@ -809,7 +809,7 @@ static int r128_freelist_init(struct drm_device *dev)static struct drm_buf *r128_freelist_get (struct drm_device * dev) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;drm_r128_private_t *dev_priv = dev->dev_private;drm_r128_buf_priv_t *buf_priv;struct drm_buf *buf;
@@ -847,7 +847,7 @@ static struct drm_buf *r128_freelist_get(struct drm_device * dev)void r128_freelist_reset (struct drm_device *dev) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;int i;for (i =0 ; i < dma->buf_count; i++) {
@@ -906,7 +906,7 @@ static int r128_cce_get_buffers(struct drm_device *dev,int r128_cce_buffers (struct drm_device *dev,void *data,struct drm_file *file_priv) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;int ret =0 ;struct drm_dma *d = data;
drivers/gpu/drm/r128/r128_state.c +9 -9
@@ -648,7 +648,7 @@ static void r128_cce_dispatch_indirect(struct drm_device *dev,*/ if (dwords &1 ) {u32 *data = (u32 *) - ((char *)dev->agp_buffer_map->handle + ((char *)dev->legacy.agp_buffer_map->handle + buf->offset + start); data[dwords++] =cpu_to_le32 (R128_CCE_PACKET2 ); }
@@ -693,7 +693,7 @@ static void r128_cce_dispatch_indices(struct drm_device *dev,drm_r128_buf_priv_t *buf_priv = buf->dev_private;drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;int format = sarea_priv->vc_format; -int offset = dev->agp_buffer_map->offset - dev_priv->cce_buffers_offset; +int offset = dev->legacy.agp_buffer_map->offset - dev_priv->cce_buffers_offset;int prim = buf_priv->prim;u32 *data;int dwords;
@@ -712,7 +712,7 @@ static void r128_cce_dispatch_indices(struct drm_device *dev, dwords = (end - start +3 ) /sizeof (u32); - data = (u32 *) ((char *)dev->agp_buffer_map->handle + data = (u32 *) ((char *)dev->legacy.agp_buffer_map->handle + buf->offset + start); data[0] = cpu_to_le32(CCE_PACKET3(R128_3D_RNDR_GEN_INDX_PRIM,
@@ -773,7 +773,7 @@ static int r128_cce_dispatch_blit(struct drm_device *dev, drm_r128_blit_t *blit) {drm_r128_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_r128_buf_priv_t *buf_priv;u32 *data;
@@ -836,7 +836,7 @@ static int r128_cce_dispatch_blit(struct drm_device *dev, dwords = (blit->width * blit->height) >> dword_shift; - data = (u32 *) ((char *)dev->agp_buffer_map->handle + buf->offset); + data = (u32 *) ((char *)dev->legacy.agp_buffer_map->handle + buf->offset); data[0 ] =cpu_to_le32 (CCE_PACKET3 (R128_CNTL_HOSTDATA_BLT , dwords +6 )); data[1] = cpu_to_le32((R128_GMC_DST_PITCH_OFFSET_CNTL |
@@ -1318,7 +1318,7 @@ static int r128_cce_swap(struct drm_device *dev, void *data, struct drm_file *fistatic int r128_cce_vertex (struct drm_device *dev,void *data,struct drm_file *file_priv) {drm_r128_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_r128_buf_priv_t *buf_priv;drm_r128_vertex_t *vertex = data;
@@ -1370,7 +1370,7 @@ static int r128_cce_vertex(struct drm_device *dev, void *data, struct drm_file *static int r128_cce_indices (struct drm_device *dev,void *data,struct drm_file *file_priv) {drm_r128_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_r128_buf_priv_t *buf_priv;drm_r128_indices_t *elts = data;
@@ -1434,7 +1434,7 @@ static int r128_cce_indices(struct drm_device *dev, void *data, struct drm_filestatic int r128_cce_blit (struct drm_device *dev,void *data,struct drm_file *file_priv) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;drm_r128_private_t *dev_priv = dev->dev_private;drm_r128_blit_t *blit = data;int ret;
@@ -1516,7 +1516,7 @@ static int r128_cce_stipple(struct drm_device *dev, void *data, struct drm_filestatic int r128_cce_indirect (struct drm_device *dev,void *data,struct drm_file *file_priv) {drm_r128_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_r128_buf_priv_t *buf_priv;drm_r128_indirect_t *indirect = data;
drivers/gpu/drm/radeon/r300_cmdbuf.c +1 -1
@@ -1015,7 +1015,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev, {drm_radeon_private_t *dev_priv = dev->dev_private;struct drm_radeon_master_private *master_priv = file_priv->master->driver_priv; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf =NULL ;int emit_dispatch_age =0 ;int ret =0 ;
drivers/gpu/drm/radeon/r600_blit.c +3 -3
@@ -165,8 +165,8 @@ set_shaders(struct drm_device *dev)DRM_DEBUG ("\n" );/* load shaders */ - vs = (u32 *) ((char *)dev->agp_buffer_map->handle + dev_priv->blit_vb->offset); - ps = (u32 *) ((char *)dev->agp_buffer_map->handle + dev_priv->blit_vb->offset +256 ); + vs = (u32 *) ((char *)dev->legacy.agp_buffer_map->handle + dev_priv->blit_vb->offset); + ps = (u32 *) ((char *)dev->legacy.agp_buffer_map->handle + dev_priv->blit_vb->offset +256 );for (i =0 ; i < r6xx_vs_size; i++) vs[i] =cpu_to_le32 (r6xx_vs[i]);
@@ -543,7 +543,7 @@ static void r600_nomm_put_vb(struct drm_device *dev)static void *r600_nomm_get_vb_ptr (struct drm_device *dev) {drm_radeon_private_t *dev_priv = dev->dev_private; -return (((char *)dev->agp_buffer_map->handle + +return (((char *)dev->legacy.agp_buffer_map->handle + dev_priv->blit_vb->offset + dev_priv->blit_vb->used)); }
drivers/gpu/drm/radeon/r600_cp.c +22 -22
127 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_cp.c +21 -21
119 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_state.c +8 -8
@@ -1617,7 +1617,7 @@ static void radeon_cp_dispatch_indirect(struct drm_device * dev,*/ if (dwords &1 ) {u32 *data = (u32 *) - ((char *)dev->agp_buffer_map->handle + ((char *)dev->legacy.agp_buffer_map->handle + buf->offset + start); data[dwords++] =RADEON_CP_PACKET2 ; }
@@ -1666,7 +1666,7 @@ static void radeon_cp_dispatch_indices(struct drm_device *dev, dwords = (prim->finish - prim->start +3 ) /sizeof (u32); - data = (u32 *) ((char *)dev->agp_buffer_map->handle + + data = (u32 *) ((char *)dev->legacy.agp_buffer_map->handle + elt_buf->offset + prim->start); data[0 ] =CP_PACKET3 (RADEON_3D_RNDR_GEN_INDX_PRIM , dwords -2 );
@@ -1818,7 +1818,7 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev,/* Dispatch the indirect buffer. */ buffer = - (u32 *) ((char *)dev->agp_buffer_map->handle + buf->offset); + (u32 *) ((char *)dev->legacy.agp_buffer_map->handle + buf->offset); dwords = size /4 ;#define RADEON_COPY_MT (_buf, _data, _width) \
@@ -2257,7 +2257,7 @@ static int radeon_cp_vertex(struct drm_device *dev, void *data, struct drm_filedrm_radeon_private_t *dev_priv = dev->dev_private;struct drm_radeon_master_private *master_priv = file_priv->master->driver_priv;drm_radeon_sarea_t *sarea_priv; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_radeon_vertex_t *vertex = data;drm_radeon_tcl_prim_t prim;
@@ -2336,7 +2336,7 @@ static int radeon_cp_indices(struct drm_device *dev, void *data, struct drm_filedrm_radeon_private_t *dev_priv = dev->dev_private;struct drm_radeon_master_private *master_priv = file_priv->master->driver_priv;drm_radeon_sarea_t *sarea_priv; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_radeon_indices_t *elts = data;drm_radeon_tcl_prim_t prim;
@@ -2474,7 +2474,7 @@ static int radeon_cp_stipple(struct drm_device *dev, void *data, struct drm_filestatic int radeon_cp_indirect (struct drm_device *dev,void *data,struct drm_file *file_priv) {drm_radeon_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_radeon_indirect_t *indirect = data;RING_LOCALS ;
@@ -2543,7 +2543,7 @@ static int radeon_cp_vertex2(struct drm_device *dev, void *data, struct drm_filedrm_radeon_private_t *dev_priv = dev->dev_private;struct drm_radeon_master_private *master_priv = file_priv->master->driver_priv;drm_radeon_sarea_t *sarea_priv; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_radeon_vertex2_t *vertex = data;int i;
@@ -2868,7 +2868,7 @@ static int radeon_cp_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_priv) {drm_radeon_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf =NULL ;drm_radeon_cmd_header_t stack_header;int idx;
drivers/gpu/drm/savage/savage_bci.c +13 -13
@@ -206,7 +206,7 @@ uint16_t savage_bci_emit_event(drm_savage_private_t * dev_priv,static int savage_freelist_init (struct drm_device * dev) {drm_savage_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *buf;drm_savage_buf_priv_t *entry;int i;
@@ -716,16 +716,16 @@ static int savage_do_init_bci(struct drm_device * dev, drm_savage_init_t * init) dev_priv->status =NULL ; }if (dev_priv->dma_type ==SAVAGE_DMA_AGP && init->buffers_offset) { - dev->agp_buffer_token = init->buffers_offset; - dev->agp_buffer_map =drm_legacy_findmap (dev, + dev->legacy.agp_buffer_token = init->buffers_offset; + dev->legacy.agp_buffer_map =drm_legacy_findmap (dev, init->buffers_offset); -if (!dev->agp_buffer_map) { +if (!dev->legacy.agp_buffer_map) {DRM_ERROR ("could not find DMA buffer region!\n" );savage_do_cleanup_bci (dev);return -EINVAL ; } -drm_legacy_ioremap (dev->agp_buffer_map, dev); -if (!dev->agp_buffer_map->handle) { +drm_legacy_ioremap (dev->legacy.agp_buffer_map, dev); +if (!dev->legacy.agp_buffer_map->handle) {DRM_ERROR ("failed to ioremap DMA buffer region!\n" );savage_do_cleanup_bci (dev);return -ENOMEM ;
@@ -750,7 +750,7 @@ static int savage_do_init_bci(struct drm_device * dev, drm_savage_init_t * init)savage_do_cleanup_bci (dev);return -EINVAL ; } -if (dev->dma && dev->dma->buflist) { +if (dev->legacy.dma && dev->legacy.dma->buflist) {DRM_ERROR ("command and vertex DMA not supported " "at the same time.\n" );savage_do_cleanup_bci (dev);
@@ -898,12 +898,12 @@ static int savage_do_cleanup_bci(struct drm_device * dev)drm_legacy_ioremapfree (dev_priv->cmd_dma, dev);if (dev_priv->dma_type ==SAVAGE_DMA_AGP && - dev->agp_buffer_map && dev->agp_buffer_map->handle) { -drm_legacy_ioremapfree (dev->agp_buffer_map, dev); + dev->legacy.agp_buffer_map && dev->legacy.agp_buffer_map->handle) { +drm_legacy_ioremapfree (dev->legacy.agp_buffer_map, dev);/* make sure the next instance (which may be running * in PCI mode) doesn't try to use an old -* agp_buffer_map. */ - dev->agp_buffer_map =NULL ; +* legacy.agp_buffer_map. */ + dev->legacy.agp_buffer_map =NULL ; }kfree (dev_priv->dma_pages);
@@ -1005,7 +1005,7 @@ static int savage_bci_get_buffers(struct drm_device *dev,int savage_bci_buffers (struct drm_device *dev,void *data,struct drm_file *file_priv) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_dma *d = data;int ret =0 ;
@@ -1038,7 +1038,7 @@ int savage_bci_buffers(struct drm_device *dev, void *data, struct drm_file *filevoid savage_reclaim_buffers (struct drm_device *dev,struct drm_file *file_priv) { -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;drm_savage_private_t *dev_priv = dev->dev_private;int release_idlelock =0 ;int i;
drivers/gpu/drm/savage/savage_state.c +1 -1
@@ -956,7 +956,7 @@ static int savage_dispatch_draw(drm_savage_private_t * dev_priv,int savage_bci_cmdbuf (struct drm_device *dev,void *data,struct drm_file *file_priv) {drm_savage_private_t *dev_priv = dev->dev_private; -struct drm_device_dma *dma = dev->dma; +struct drm_device_dma *dma = dev->legacy.dma;struct drm_buf *dmabuf;drm_savage_cmdbuf_t *cmdbuf = data;drm_savage_cmd_header_t *kcmd_addr =NULL ;
drivers/gpu/drm/sis/sis_mm.c +1 -1
@@ -226,7 +226,7 @@ static drm_local_map_t *sis_reg_init(struct drm_device *dev)struct drm_map_list *entry;drm_local_map_t *map; -list_for_each_entry (entry, &dev->maplist, head) { +list_for_each_entry (entry, &dev->legacy.maplist, head) { map = entry->map;if (!map)continue ;
drivers/gpu/drm/via/via_mm.c +1 -1
@@ -79,7 +79,7 @@ int via_final_context(struct drm_device *dev, int context)/* Linux specific until context tracking code gets ported to BSD */ /* Last context, perform cleanup */ -if (list_is_singular (&dev->ctxlist)) { +if (list_is_singular (&dev->legacy.ctxlist)) {DRM_DEBUG ("Last Context\n" );drm_irq_uninstall (dev);via_cleanup_futex (dev_priv);
drivers/gpu/drm/via/via_verifier.c +1 -1
@@ -262,7 +262,7 @@ static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq,return map; } -list_for_each_entry (r_list, &dev->maplist, head) { +list_for_each_entry (r_list, &dev->legacy.maplist, head) { map = r_list->map;if (!map)continue ;
include/drm/drmP.h +56 -37
134 lines not on this page · raw message
include/drm/drm_legacy.h +1 -1
@@ -194,7 +194,7 @@ static __inline__ struct drm_local_map *drm_legacy_findmap(struct drm_device *de unsigned int token) {struct drm_map_list *_entry; -list_for_each_entry (_entry, &dev->maplist, head) +list_for_each_entry (_entry, &dev->legacy.maplist, head)if (_entry->user_token == token)return _entry->map;return NULL ;
Signature · 1 line
1.9.3