diff options
| author | rnoland <rnoland@FreeBSD.org> | 2009-03-19 08:22:56 +0000 |
|---|---|---|
| committer | rnoland <rnoland@FreeBSD.org> | 2009-03-19 08:22:56 +0000 |
| commit | 78db4b9606deef31d68cf7c7e04fda39343712e3 (patch) | |
| tree | 53b9ba9edd7440aeda63e0f66f706ecacf9630a6 /sys/dev/drm/i915_drv.h | |
| parent | 76f193cd692e42617fb7f33b9581e7e5a3da58f0 (diff) | |
| download | FreeBSD-src-78db4b9606deef31d68cf7c7e04fda39343712e3.zip FreeBSD-src-78db4b9606deef31d68cf7c7e04fda39343712e3.tar.gz | |
Pull in some suspend / resume changes from Intel's code
Tested by: mav@
MFC after: 3 days
Diffstat (limited to 'sys/dev/drm/i915_drv.h')
| -rw-r--r-- | sys/dev/drm/i915_drv.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/drm/i915_drv.h b/sys/dev/drm/i915_drv.h index 0935a70..92c8f74 100644 --- a/sys/dev/drm/i915_drv.h +++ b/sys/dev/drm/i915_drv.h @@ -151,6 +151,8 @@ typedef struct drm_i915_private { u32 saveDSPACNTR; u32 saveDSPBCNTR; u32 saveDSPARB; + u32 saveRENDERSTANDBY; + u32 saveHWS; u32 savePIPEACONF; u32 savePIPEBCONF; u32 savePIPEASRC; @@ -232,8 +234,8 @@ typedef struct drm_i915_private { u8 saveAR_INDEX; u8 saveAR[21]; u8 saveDACMASK; - u8 saveDACDATA[256*3]; /* 256 3-byte colors */ u8 saveCR[37]; + struct { #ifdef __linux__ struct drm_mm gtt_space; @@ -651,7 +653,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \ (dev)->pci_device == 0x2E12 || \ - (dev)->pci_device == 0x2E22) + (dev)->pci_device == 0x2E22 || \ + IS_GM45(dev)) #define IS_G33(dev) ((dev)->pci_device == 0x29C2 || \ (dev)->pci_device == 0x29B2 || \ |
