diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-10 06:44:11 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-10 06:44:19 +0100 |
| commit | 0b5e8db639de032bd4febbb0a5b1cd2c19bac26d (patch) | |
| tree | eddc436f8cbf85cea5205f7dc118bf0068c2d127 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | Merge remote branch 'korg/drm-radeon-dp' into drm-linus (diff) | |
| parent | drm/i915: Remove a debugging printk from hangcheck (diff) | |
| download | linux-0b5e8db639de032bd4febbb0a5b1cd2c19bac26d.tar.xz linux-0b5e8db639de032bd4febbb0a5b1cd2c19bac26d.zip | |
Merge remote branch 'anholt/drm-intel-next' into drm-linus
Pull more Intel changes in, especially one to init the GTT properly
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index df5b943fccda..fbecac72f5bb 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -383,8 +383,6 @@ typedef struct drm_i915_private { u32 saveFDI_RXA_IMR; u32 saveFDI_RXB_IMR; u32 saveCACHE_MODE_0; - u32 saveD_STATE; - u32 saveDSPCLK_GATE_D; u32 saveMI_ARB_STATE; u32 saveSWF0[16]; u32 saveSWF1[16]; |