diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
commit | e93721a70263afefbac781f575bfe851c6f95d84 (patch) | |
tree | ab359f12a0688802aa99339bae82c51763dae9f6 /drivers/gpu/drm/i915/i915_drv.h | |
parent | ae1ec5e1e97f67d41e641a73380129e5905e41cc (diff) | |
parent | c87d9732004b3f8fd82d729f12ccfb96c0df279e (diff) |
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 25065923b8a8..9b149fe824c3 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -283,6 +283,7 @@ typedef struct drm_i915_private { | |||
283 | u8 saveAR[21]; | 283 | u8 saveAR[21]; |
284 | u8 saveDACMASK; | 284 | u8 saveDACMASK; |
285 | u8 saveCR[37]; | 285 | u8 saveCR[37]; |
286 | uint64_t saveFENCE[16]; | ||
286 | 287 | ||
287 | struct { | 288 | struct { |
288 | struct drm_mm gtt_space; | 289 | struct drm_mm gtt_space; |
@@ -705,13 +706,8 @@ extern void intel_modeset_cleanup(struct drm_device *dev); | |||
705 | #define I915_WRITE16(reg, val) writel(val, dev_priv->regs + (reg)) | 706 | #define I915_WRITE16(reg, val) writel(val, dev_priv->regs + (reg)) |
706 | #define I915_READ8(reg) readb(dev_priv->regs + (reg)) | 707 | #define I915_READ8(reg) readb(dev_priv->regs + (reg)) |
707 | #define I915_WRITE8(reg, val) writeb(val, dev_priv->regs + (reg)) | 708 | #define I915_WRITE8(reg, val) writeb(val, dev_priv->regs + (reg)) |
708 | #ifdef writeq | ||
709 | #define I915_WRITE64(reg, val) writeq(val, dev_priv->regs + (reg)) | 709 | #define I915_WRITE64(reg, val) writeq(val, dev_priv->regs + (reg)) |
710 | #else | 710 | #define I915_READ64(reg) readq(dev_priv->regs + (reg)) |
711 | #define I915_WRITE64(reg, val) (writel(val, dev_priv->regs + (reg)), \ | ||
712 | writel(upper_32_bits(val), dev_priv->regs + \ | ||
713 | (reg) + 4)) | ||
714 | #endif | ||
715 | #define POSTING_READ(reg) (void)I915_READ(reg) | 711 | #define POSTING_READ(reg) (void)I915_READ(reg) |
716 | 712 | ||
717 | #define I915_VERBOSE 0 | 713 | #define I915_VERBOSE 0 |
@@ -790,7 +786,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); | |||
790 | (dev)->pci_device == 0x2E22 || \ | 786 | (dev)->pci_device == 0x2E22 || \ |
791 | (dev)->pci_device == 0x2E32) | 787 | (dev)->pci_device == 0x2E32) |
792 | 788 | ||
793 | #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02) | 789 | #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02 || \ |
790 | (dev)->pci_device == 0x2A12) | ||
794 | 791 | ||
795 | #define IS_GM45(dev) ((dev)->pci_device == 0x2A42) | 792 | #define IS_GM45(dev) ((dev)->pci_device == 0x2A42) |
796 | 793 | ||