diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-24 20:21:45 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-24 20:21:45 +1000 |
| commit | 2d370f502ac872dc9b4cd05f9922b260e2874ec1 (patch) | |
| tree | e7447c934eae915f33851e939875d5dca2b3ea09 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 64146f8b2af1ba77fe3c21d9d6d7213b9bb72b40 (diff) | |
| parent | f0c860246472248a534656d6cdbed5a36d1feb2e (diff) | |
| download | op-kernel-dev-2d370f502ac872dc9b4cd05f9922b260e2874ec1.zip op-kernel-dev-2d370f502ac872dc9b4cd05f9922b260e2874ec1.tar.gz | |
Merge remote branch 'intel/drm-intel-fixes' of ../drm-next into drm-core-next
* 'intel/drm-intel-fixes' of ../drm-next:
Revert "drm/i915: Don't save/restore hardware status page address register"
drm/i915: Avoid unmapping pages from a NULL address space
drm/i915: Fix use after free within tracepoint
drm/i915: Restore missing command flush before interrupt on BLT ring
drm/i915: Disable pagefaults along execbuffer relocation fast path
drm/i915: Fix computation of pitch for dumb bo creator
drm/i915: report correct render clock frequencies on SNB
drm/i915/dp: Correct the order of deletion for ghost eDP devices
drm/i915: Fix tiling corruption from pipelined fencing
drm/i915: Re-enable self-refresh
drm/i915: Prevent racy removal of request from client list
drm/i915: skip redundant operations whilst enabling pipes and planes
drm/i915: Remove surplus POSTING_READs before wait_for_vblank
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 4496505..5004724 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -383,6 +383,7 @@ typedef struct drm_i915_private { u32 saveDSPACNTR; u32 saveDSPBCNTR; u32 saveDSPARB; + u32 saveHWS; u32 savePIPEACONF; u32 savePIPEBCONF; u32 savePIPEASRC; |
