History

Merge tag 'drm-intel-next-2016-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next

- select igt testing depencies for CONFIG_DRM_I915_DEBUG (Chris) - track outputs in crtc state and clean up all our ad-hoc connector/encoder walking in modest code (Ville) - demidlayer drm_device/drm_i915_private (Chris Wilson) - thundering herd fix from Chris Wilson, with lots of help from Tvrtko Ursulin - piles of assorted clean and fallout from the thundering herd fix - documentation and more tuning for waitboosting (Chris) - pooled EU support on bxt (Arun Siluvery) - bxt support is no longer considered prelimary! - ring/engine vfunc cleanup from Tvrtko - introduce intel_wait_for_register helper (Chris) - opregion updates (Jani Nukla) - tuning and fixes for wait_for macros (Tvrkto&Imre) - more kabylake pci ids (Rodrigo) - pps cleanup and fixes for bxt (Imre) - move sink crc support over to atomic state (Maarten) - fix up async fbdev init ordering (Chris) - fbc fixes from Paulo and Chris * tag 'drm-intel-next-2016-07-11' of git://anongit.freedesktop.org/drm-intel: (223 commits) drm/i915: Update DRIVER_DATE to 20160711 drm/i915: Select DRM_VGEM for igt drm/i915: Select X86_MSR for igt drm/i915: Fill unused GGTT with scratch pages for VT-d drm/i915: Introduce Kabypoint PCH for Kabylake H/DT. drm/i915:gen9: implement WaMediaPoolStateCmdInWABB drm/i915: Check for invalid cloning earlier during modeset drm/i915: Simplify hdmi_12bpc_possible() drm/i915: Kill has_dsi_encoder drm/i915: s/INTEL_OUTPUT_DISPLAYPORT/INTEL_OUTPUT_DP/ drm/i915: Replace some open coded intel_crtc_has_dp_encoder()s drm/i915: Kill has_dp_encoder from pipe_config drm/i915: Replace manual lvds and sdvo/hdmi counting with intel_crtc_has_type() drm/i915: Unify intel_pipe_has_type() and intel_pipe_will_have_type() drm/i915: Add output_types bitmask into the crtc state drm/i915: Remove encoder type checks from MST suspend/resume drm/i915: Don't mark eDP encoders as MST capable drm/i915: avoid wait_for_atomic() in non-atomic host2guc_action() drm/i915: Group the irq breadcrumb variables into the same cacheline drm/i915: Wake up the bottom-half if we steal their interrupt ...

Dave Airlie committed 10 years ago

Commit ff37c052 parents 6c181c8 0b2c05872 files · +6430 −5501Browse files

Showing the changes to include/uapi (1 of 72 files). Show all

Unified · Split

include/uapi/drm/i915_drm.h+3−0
@@ -361,6 +361,8 @@ typedef struct drm_i915_irq_wait { · 360 unmodified lines
361361 #define I915_PARAM_HAS_GPU_RESET 35
362362 #define I915_PARAM_HAS_RESOURCE_STREAMER 36
363363 #define I915_PARAM_HAS_EXEC_SOFTPIN 37
364+#define I915_PARAM_HAS_POOLED_EU 38
365+#define I915_PARAM_MIN_EU_IN_POOL 39
364366
365367 typedef struct drm_i915_getparam {
366368 __s32 param;
@@ -1171,6 +1173,7 @@ struct drm_i915_gem_context_param { · 804 unmodified lines
11711173 #define I915_CONTEXT_PARAM_BAN_PERIOD 0x1
11721174 #define I915_CONTEXT_PARAM_NO_ZEROMAP 0x2
11731175 #define I915_CONTEXT_PARAM_GTT_SIZE 0x3
1176+#define I915_CONTEXT_PARAM_NO_ERROR_CAPTURE 0x4
11741177 __u64 value;
11751178 };
11761179

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t