diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index c684686f6c0f..372adfdd9de0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -138,6 +138,7 @@ enum nouveau_flags { | |||
138 | #define NVOBJ_FLAG_ZERO_FREE (1 << 2) | 138 | #define NVOBJ_FLAG_ZERO_FREE (1 << 2) |
139 | #define NVOBJ_FLAG_FAKE (1 << 3) | 139 | #define NVOBJ_FLAG_FAKE (1 << 3) |
140 | struct nouveau_gpuobj { | 140 | struct nouveau_gpuobj { |
141 | struct drm_device *dev; | ||
141 | struct list_head list; | 142 | struct list_head list; |
142 | 143 | ||
143 | struct nouveau_channel *im_channel; | 144 | struct nouveau_channel *im_channel; |
@@ -1291,17 +1292,8 @@ static inline void nv_wi32(struct drm_device *dev, unsigned offset, u32 val) | |||
1291 | } | 1292 | } |
1292 | 1293 | ||
1293 | /* object access */ | 1294 | /* object access */ |
1294 | static inline u32 nv_ro32(struct drm_device *dev, struct nouveau_gpuobj *obj, | 1295 | extern u32 nv_ro32(struct nouveau_gpuobj *, u32 offset); |
1295 | unsigned index) | 1296 | extern void nv_wo32(struct nouveau_gpuobj *, u32 offset, u32 val); |
1296 | { | ||
1297 | return nv_ri32(dev, obj->im_pramin->start + index * 4); | ||
1298 | } | ||
1299 | |||
1300 | static inline void nv_wo32(struct drm_device *dev, struct nouveau_gpuobj *obj, | ||
1301 | unsigned index, u32 val) | ||
1302 | { | ||
1303 | nv_wi32(dev, obj->im_pramin->start + index * 4, val); | ||
1304 | } | ||
1305 | 1297 | ||
1306 | /* | 1298 | /* |
1307 | * Logging | 1299 | * Logging |