diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-02-07 15:29:04 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-02-07 15:29:04 +0000 |
| commit | 198ceac091049003ffcc4b7cda76785510fc3b59 (patch) | |
| tree | c38ebdd90a52bae47a1811ab879f2108ad728670 /include | |
| parent | 83b316fdafcc37e3e65b4a650afb7aab5cc2d271 (diff) | |
| parent | 3d29b842e58fbca2c13a9f458fddbaa535c6e578 (diff) | |
| download | op-kernel-dev-198ceac091049003ffcc4b7cda76785510fc3b59.zip op-kernel-dev-198ceac091049003ffcc4b7cda76785510fc3b59.tar.gz | |
Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next
* 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: add a LLC feature flag in device description
drm/i915: kill i915_mem.c
drm/i915: Use kcalloc instead of kzalloc to allocate array
drm/i915/dp: Check for AUXCH error before checking for success
drm/i915/dp: Use auxch precharge value of 5 everywhere
drm/i915/dp: Tweak auxch clock divider for PCH
drm/i915: Remove a comment about PCH from the non-PCH path
drm/i915: Fix assert_pch_hdmi_disabled to mention HDMI (not DP)
drm/i915: Implement plane-disabled assertion for PCH too
drivers: i915: Fix BLC PWM register setup
drm/i915: Check that plane/pipe is disabled before removing the fb
drm/i915: fix typo in function name
drm/i915: split out pll divider code
drm/i915: split 9xx refclk & sdvo tv code out
agp/intel: Add pci id for hostbridge from has/qemu
drm/i915: there is no pipe CxSR on ironlake
drm/i915: Only look for matching clocks for LVDS downclock
drm/i915: Silence _DSM errors
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/i915_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 924f6a4..da929bb 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -296,6 +296,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_HAS_EXEC_CONSTANTS 14 #define I915_PARAM_HAS_RELAXED_DELTA 15 #define I915_PARAM_HAS_GEN7_SOL_RESET 16 +#define I915_PARAM_HAS_LLC 17 typedef struct drm_i915_getparam { int param; |
