diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-09-10 20:52:08 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-09-10 20:52:08 -0400 |
| commit | 91b6fc02a258422bf342992add24cfe70a029eca (patch) | |
| tree | 55c7c5a1fc361b23e5cbfd8a042c301194748831 /include | |
| parent | bd3e1c7c6de9f5f70d97cdb6c817151c0477c5e3 (diff) | |
| parent | 824257857fd81f5e749831ff9cd63566b5a86abe (diff) | |
Merge tag 'drm-intel-next-fixes-2015-09-10' of git://anongit.freedesktop.org/drm-intel into drm-next
Fixes headed for v4.3-rc1, including Maarten's DP MST state checker fix
you requested.
* tag 'drm-intel-next-fixes-2015-09-10' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Allow DSI dual link to be configured on any pipe
drm/i915: Don't try to use DDR DVFS on CHV when disabled in the BIOS
drm/i915: Fix CSR MMIO address check
drm/i915: Limit the number of loops for reading a split 64bit register
drm/i915: Fix broken mst get_hw_state.
drm/i915: Pass hpd_status_i915[] to intel_get_hpd_pins() in pre-g4x
uapi/drm/i915_drm.h: fix userspace compilation.
drm/i915: Always mark the object as dirty when used by the GPU
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/drm/i915_drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index dbd16a2d37db..fd5aa47bd689 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h | |||
| @@ -358,7 +358,7 @@ typedef struct drm_i915_irq_wait { | |||
| 358 | #define I915_PARAM_HAS_RESOURCE_STREAMER 36 | 358 | #define I915_PARAM_HAS_RESOURCE_STREAMER 36 |
| 359 | 359 | ||
| 360 | typedef struct drm_i915_getparam { | 360 | typedef struct drm_i915_getparam { |
| 361 | s32 param; | 361 | __s32 param; |
| 362 | /* | 362 | /* |
| 363 | * WARNING: Using pointers instead of fixed-size u64 means we need to write | 363 | * WARNING: Using pointers instead of fixed-size u64 means we need to write |
| 364 | * compat32 code. Don't repeat this mistake. | 364 | * compat32 code. Don't repeat this mistake. |