diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-02 16:23:01 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-02 16:23:01 +1100 |
| commit | 269dc51296f4e985741d2fd567e7be4e7a0a9f29 (patch) | |
| tree | 88589ce8ddc51a48f691a2c078863682e645293b /drivers/char/drm/drmP.h | |
| parent | 3528af1b189d0fbb4c7a3f121f46d9987b9af5b6 (diff) | |
| download | op-kernel-dev-269dc51296f4e985741d2fd567e7be4e7a0a9f29.zip op-kernel-dev-269dc51296f4e985741d2fd567e7be4e7a0a9f29.tar.gz | |
drm: bring savage inline with latest CVS
apply some whitespace cleanup and add wrappers for MTRR for OS calls
From: Eric Anholt <anholt@freebsd.org> + Dave Airlie <airlied@linux.ie>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drmP.h')
| -rw-r--r-- | drivers/char/drm/drmP.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 295de65..a3ad85e 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h @@ -750,6 +750,21 @@ static inline int drm_core_has_MTRR(struct drm_device *dev) { return drm_core_check_feature(dev, DRIVER_USE_MTRR); } + +#define DRM_MTRR_WC MTRR_TYPE_WRCOMB + +static inline int drm_mtrr_add(unsigned long offset, unsigned long size, + unsigned int flags) +{ + return mtrr_add(offset, size, flags, 1); +} + +static inline int drm_mtrr_del(int handle, unsigned long offset, + unsigned long size, unsigned int flags) +{ + return mtrr_del(handle, offset, size); +} + #else #define drm_core_has_MTRR(dev) (0) #endif |
