diff options
author | Dave Airlie <airlied@redhat.com> | 2012-06-08 09:42:35 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-06-08 09:42:35 +0100 |
commit | 6cf98d6ebb37a183d92c4183dc228cdeef9a7083 (patch) | |
tree | a37584328f0e1df87db9b1c8662655a2e8891a43 /drivers/gpu/drm/i915/i915_drv.h | |
parent | 7aaa61b3476462b69f1ac7669fcca8d608ce3cb5 (diff) | |
parent | 23e81d691a813839020f6e516b398d0f9369fe8b (diff) | |
download | blackbird-op-linux-6cf98d6ebb37a183d92c4183dc228cdeef9a7083.tar.gz blackbird-op-linux-6cf98d6ebb37a183d92c4183dc228cdeef9a7083.zip |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: pch_irq_handler -> {ibx, cpt}_irq_handler
char/agp: add another Ironlake host bridge
drm/i915: fix up ivb plane 3 pageflips
drm/i915: hold forcewake around ring hw init
drm/i915: Mark the ringbuffers as being in the GTT domain
drm/i915/crt: Do not rely upon the HPD presence pin
drm/i915: Reset last_retired_head when resetting ring
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index c9cfc67c2cf5..b0b676abde0d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -285,6 +285,7 @@ struct intel_device_info { u8 is_ivybridge:1; u8 is_valleyview:1; u8 has_pch_split:1; + u8 has_force_wake:1; u8 is_haswell:1; u8 has_fbc:1; u8 has_pipe_cxsr:1; @@ -1101,6 +1102,8 @@ struct drm_i915_file_private { #define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT) #define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX) +#define HAS_FORCE_WAKE(dev) (INTEL_INFO(dev)->has_force_wake) + #include "i915_trace.h" /** |