diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:52:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:52:35 -0700 |
| commit | 5335a40be6867eff986a31bcd8fc82a5cb1e16bb (patch) | |
| tree | b32be59c2a2679a5cc3fef172006886f7dcd2466 /drivers/char/drm/r128_drv.h | |
| parent | 393bfca19ecdce60a8d9a4d2577cac11ca924a25 (diff) | |
| parent | ef68d295508d52e792abf70d4f84461104d33b9d (diff) | |
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
via: Make sure we flush write-combining using a follow-up read.
via: Try to improve command-buffer chaining.
drm: remove old taskqueue remnant
drm: rename badly named define and cleanup ioctl code spacing
radeon: Don't mess up page flipping when a file descriptor is closed.
drm/radeon: upgrade to 1.27 - make PCI GART more flexible
Diffstat (limited to 'drivers/char/drm/r128_drv.h')
| -rw-r--r-- | drivers/char/drm/r128_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h index f1efb49de8d..9086835686d 100644 --- a/drivers/char/drm/r128_drv.h +++ b/drivers/char/drm/r128_drv.h @@ -383,6 +383,8 @@ extern long r128_compat_ioctl(struct file *filp, unsigned int cmd, #define R128_PERFORMANCE_BOXES 0 +#define R128_PCIGART_TABLE_SIZE 32768 + #define R128_READ(reg) DRM_READ32( dev_priv->mmio, (reg) ) #define R128_WRITE(reg,val) DRM_WRITE32( dev_priv->mmio, (reg), (val) ) #define R128_READ8(reg) DRM_READ8( dev_priv->mmio, (reg) ) |