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.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index bbf19861b6c..e82dff4008c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -795,8 +795,10 @@ extern int nouveau_ioctl_getparam(struct drm_device *, void *data,
795 struct drm_file *); 795 struct drm_file *);
796extern int nouveau_ioctl_setparam(struct drm_device *, void *data, 796extern int nouveau_ioctl_setparam(struct drm_device *, void *data,
797 struct drm_file *); 797 struct drm_file *);
798extern bool nouveau_wait_until(struct drm_device *, uint64_t timeout, 798extern bool nouveau_wait_eq(struct drm_device *, uint64_t timeout,
799 uint32_t reg, uint32_t mask, uint32_t val); 799 uint32_t reg, uint32_t mask, uint32_t val);
800extern bool nouveau_wait_ne(struct drm_device *, uint64_t timeout,
801 uint32_t reg, uint32_t mask, uint32_t val);
800extern bool nouveau_wait_for_idle(struct drm_device *); 802extern bool nouveau_wait_for_idle(struct drm_device *);
801extern int nouveau_card_init(struct drm_device *); 803extern int nouveau_card_init(struct drm_device *);
802 804
@@ -1434,7 +1436,9 @@ static inline void nv_wr08(struct drm_device *dev, unsigned reg, u8 val)
1434} 1436}
1435 1437
1436#define nv_wait(dev, reg, mask, val) \ 1438#define nv_wait(dev, reg, mask, val) \
1437 nouveau_wait_until(dev, 2000000000ULL, (reg), (mask), (val)) 1439 nouveau_wait_eq(dev, 2000000000ULL, (reg), (mask), (val))
1440#define nv_wait_ne(dev, reg, mask, val) \
1441 nouveau_wait_ne(dev, 2000000000ULL, (reg), (mask), (val))
1438 1442
1439/* PRAMIN access */ 1443/* PRAMIN access */
1440static inline u32 nv_ri32(struct drm_device *dev, unsigned offset) 1444static inline u32 nv_ri32(struct drm_device *dev, unsigned offset)