aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index e6708be58bc..d152bc334fd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -165,7 +165,11 @@ struct nouveau_channel {
165 struct drm_device *dev; 165 struct drm_device *dev;
166 int id; 166 int id;
167 167
168 atomic_t refcount; 168 /* references to the channel data structure */
169 struct kref ref;
170 /* users of the hardware channel resources, the hardware
171 * context will be kicked off when it reaches zero. */
172 atomic_t users;
169 struct mutex mutex; 173 struct mutex mutex;
170 174
171 /* owner of this fifo */ 175 /* owner of this fifo */
@@ -808,6 +812,8 @@ extern struct nouveau_channel *
808nouveau_channel_get(struct drm_device *, struct drm_file *, int id); 812nouveau_channel_get(struct drm_device *, struct drm_file *, int id);
809extern void nouveau_channel_put_unlocked(struct nouveau_channel **); 813extern void nouveau_channel_put_unlocked(struct nouveau_channel **);
810extern void nouveau_channel_put(struct nouveau_channel **); 814extern void nouveau_channel_put(struct nouveau_channel **);
815extern void nouveau_channel_ref(struct nouveau_channel *chan,
816 struct nouveau_channel **pchan);
811 817
812/* nouveau_object.c */ 818/* nouveau_object.c */
813extern int nouveau_gpuobj_early_init(struct drm_device *); 819extern int nouveau_gpuobj_early_init(struct drm_device *);