summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-09-11 10:52:08 +1000
committerDave Airlie <airlied@redhat.com>2015-09-11 10:52:08 +1000
commit91b6fc02a258422bf342992add24cfe70a029eca (patch)
tree55c7c5a1fc361b23e5cbfd8a042c301194748831 /include
parentbd3e1c7c6de9f5f70d97cdb6c817151c0477c5e3 (diff)
parent824257857fd81f5e749831ff9cd63566b5a86abe (diff)
downloadlinux-stable-91b6fc02a258422bf342992add24cfe70a029eca.tar.gz
linux-stable-91b6fc02a258422bf342992add24cfe70a029eca.tar.bz2
linux-stable-91b6fc02a258422bf342992add24cfe70a029eca.zip
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.h2
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 {
#define I915_PARAM_HAS_RESOURCE_STREAMER 36
typedef struct drm_i915_getparam {
- s32 param;
+ __s32 param;
/*
* WARNING: Using pointers instead of fixed-size u64 means we need to write
* compat32 code. Don't repeat this mistake.