xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nv50-nvc0/vm: take client reference on shared channel vm

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2011-06-03 10:07:08 +10:00
parent b79181cbad
commit fe32b16e79
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/nouveau_drv.h
View File

@@ -48,6 +48,7 @@
struct nouveau_fpriv { struct nouveau_fpriv {
spinlock_t lock; spinlock_t lock;
struct list_head channels; struct list_head channels;
struct nouveau_vm *vm;
}; };
static inline struct nouveau_fpriv * static inline struct nouveau_fpriv *

5
drivers/gpu/drm/nouveau/nouveau_state.c
View File

@@ -767,6 +767,7 @@ static void nouveau_card_takedown(struct drm_device *dev)
int int
nouveau_open(struct drm_device *dev, struct drm_file *file_priv) nouveau_open(struct drm_device *dev, struct drm_file *file_priv)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_fpriv *fpriv; struct nouveau_fpriv *fpriv;
fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL); fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL);
@@ -776,6 +777,9 @@ nouveau_open(struct drm_device *dev, struct drm_file *file_priv)
spin_lock_init(&fpriv->lock); spin_lock_init(&fpriv->lock);
INIT_LIST_HEAD(&fpriv->channels); INIT_LIST_HEAD(&fpriv->channels);
if (dev_priv->card_type >= NV_50)
nouveau_vm_ref(dev_priv->chan_vm, &fpriv->vm, NULL);
file_priv->driver_priv = fpriv; file_priv->driver_priv = fpriv;
return 0; return 0;
} }
@@ -791,6 +795,7 @@ void
nouveau_postclose(struct drm_device *dev, struct drm_file *file_priv) nouveau_postclose(struct drm_device *dev, struct drm_file *file_priv)
{ {
struct nouveau_fpriv *fpriv = nouveau_fpriv(file_priv); struct nouveau_fpriv *fpriv = nouveau_fpriv(file_priv);
nouveau_vm_ref(NULL, &fpriv->vm, NULL);
kfree(fpriv); kfree(fpriv);
} }