diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-02-23 14:11:53 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-02-23 14:11:53 +0000 |
| commit | e5bcf23443740f741df8e5461ccdad0f10d1a75b (patch) | |
| tree | 18867fdd805f1beefd3592bca76f4794bdc094b8 /include | |
| parent | 019d96cb55ade38a4b4a52bba0304e8cd681f30a (diff) | |
| parent | ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1 (diff) | |
| download | talos-op-linux-e5bcf23443740f741df8e5461ccdad0f10d1a75b.tar.gz talos-op-linux-e5bcf23443740f741df8e5461ccdad0f10d1a75b.zip | |
Merge tag 'drm-intel-next-2012-02-16-merge-resolved' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
* tag 'drm-intel-next-2012-02-16-merge-resolved' of git://people.freedesktop.org/~danvet/drm-intel: (45 commits)
Revert "drivers/gpu/drm/i915/intel_overlay.c needs seq_file.h"
drm/i915/lvds: Always use the presence pin for LVDS on PCH
drm/i915: Record the position of the request upon error
drm/i915: Record the in-flight requests at the time of a hang
drm/i915: Record the tail at each request and use it to estimate the head
drm/i915: add missing SDVO bits for interlaced modes on ILK
drm/i915: Fix race condition in accessing GMBUS
drm/i915: add a "force-dvi" HDMI audio mode
drm/i915: Don't lock panel registers when downclocking
drm/i915: fix up locking inconsistency around gem_do_init
drm/i915: enable forcewake voodoo also for gen6
drm/i915: fixup seqno allocation logic for lazy_request
drm/i915: outstanding_lazy_request is a u32
drm/i915: check gtfifodbg after possibly failed writes
drm/i915: catch gtfifo errors on forcewake_put
drm/i915: use gtfifodbg
drm/i915: set interlaced bits for TRANSCONF
drm/i915: fixup overlay checks for interlaced modes
drm/i915: allow interlaced mode output on the HDMI connector
drm/i915: allow interlaced mode output on the SDVO connector
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/intel-gtt.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index b174620cc9b3..0a0001b9dc78 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h @@ -15,6 +15,10 @@ const struct intel_gtt { unsigned int needs_dmar : 1; /* Whether we idle the gpu before mapping/unmapping */ unsigned int do_idle_maps : 1; + /* Share the scratch page dma with ppgtts. */ + dma_addr_t scratch_page_dma; + /* for ppgtt PDE access */ + u32 __iomem *gtt; } *intel_gtt_get(void); void intel_gtt_chipset_flush(void); |
