UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/via: track obj->drm_fd relations in the driver 

Exactly like the previous patch for sis.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2011-10-25 16:32:45 +02:00
parent fdc0b8a63c
commit c828e20456
3 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/drm/via/via_drv.c
View File

@ -30,6 +30,29 @@
#include "drm_pciids.h" #include "drm_pciids.h"
static int via_driver_open(struct drm_device *dev, struct drm_file *file)
{
struct via_file_private *file_priv;
DRM_DEBUG_DRIVER("\n");
file_priv = kmalloc(sizeof(*file_priv), GFP_KERNEL);
if (!file_priv)
return -ENOMEM;
file->driver_priv = file_priv;
INIT_LIST_HEAD(&file_priv->obj_list);
return 0;
}
void via_driver_postclose(struct drm_device *dev, struct drm_file *file)
{
struct via_file_private *file_priv = file->driver_priv;
kfree(file_priv);
}
static struct pci_device_id pciidlist[] = { static struct pci_device_id pciidlist[] = {
viadrv_PCI_IDS viadrv_PCI_IDS
}; };
@ -51,6 +74,8 @@ static struct drm_driver driver = {
DRIVER_IRQ_SHARED, DRIVER_IRQ_SHARED,
.load = via_driver_load, .load = via_driver_load,
.unload = via_driver_unload, .unload = via_driver_unload,
.open = via_driver_open,
.postclose = via_driver_postclose,
.context_dtor = via_final_context, .context_dtor = via_final_context,
.get_vblank_counter = via_get_vblank_counter, .get_vblank_counter = via_get_vblank_counter,
.enable_vblank = via_enable_vblank, .enable_vblank = via_enable_vblank,

22
drivers/gpu/drm/via/via_mm.c
View File

@ -115,12 +115,13 @@ void via_lastclose(struct drm_device *dev)
} }
int via_mem_alloc(struct drm_device *dev, void *data, int via_mem_alloc(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file)
{ {
drm_via_mem_t *mem = data; drm_via_mem_t *mem = data;
int retval = 0; int retval = 0;
struct drm_memblock_item *item; struct drm_memblock_item *item;
drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
struct via_file_private *file_priv = file->driver_priv;
unsigned long tmpSize; unsigned long tmpSize;
if (mem->type > VIA_MEM_AGP) { if (mem->type > VIA_MEM_AGP) {
@ -137,10 +138,10 @@ int via_mem_alloc(struct drm_device *dev, void *data,
} }
tmpSize = (mem->size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT; tmpSize = (mem->size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
item = drm_sman_alloc(&dev_priv->sman, mem->type, tmpSize, 0, item = drm_sman_alloc(&dev_priv->sman, mem->type, tmpSize, 0, 0);
(unsigned long)file_priv);
mutex_unlock(&dev->struct_mutex);
if (item) { if (item) {
list_move(&item->owner_list, &file_priv->obj_list);
mem->offset = ((mem->type == VIA_MEM_VIDEO) ? mem->offset = ((mem->type == VIA_MEM_VIDEO) ?
dev_priv->vram_offset : dev_priv->agp_offset) + dev_priv->vram_offset : dev_priv->agp_offset) +
(item->mm-> (item->mm->
@ -153,6 +154,7 @@ int via_mem_alloc(struct drm_device *dev, void *data,
DRM_DEBUG("Video memory allocation failed\n"); DRM_DEBUG("Video memory allocation failed\n");
retval = -ENOMEM; retval = -ENOMEM;
} }
mutex_unlock(&dev->struct_mutex);
return retval; return retval;
} }
@ -173,12 +175,13 @@ int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv)
void via_reclaim_buffers_locked(struct drm_device *dev, void via_reclaim_buffers_locked(struct drm_device *dev,
struct drm_file *file_priv) struct drm_file *file)
{ {
drm_via_private_t *dev_priv = dev->dev_private; struct via_file_private *file_priv = file->driver_priv;
struct drm_memblock_item *entry, *next;
mutex_lock(&dev->struct_mutex); mutex_lock(&dev->struct_mutex);
if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)file_priv)) { if (list_empty(&file_priv->obj_list)) {
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
return; return;
} }
@ -186,7 +189,10 @@ void via_reclaim_buffers_locked(struct drm_device *dev,
if (dev->driver->dma_quiescent) if (dev->driver->dma_quiescent)
dev->driver->dma_quiescent(dev); dev->driver->dma_quiescent(dev);
drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv); list_for_each_entry_safe(entry, next, &file_priv->obj_list,
owner_list) {
drm_sman_free(entry);
}
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
return; return;
} }

4
include/drm/via_drm.h
View File

@ -274,4 +274,8 @@ typedef struct drm_via_dmablit {
drm_via_blitsync_t sync; drm_via_blitsync_t sync;
} drm_via_dmablit_t; } drm_via_dmablit_t;
struct via_file_private {
struct list_head obj_list;
};
#endif /* _VIA_DRM_H_ */ #endif /* _VIA_DRM_H_ */