- refactor i915/snd-hda interaction to use the component framework (Imre) - psr cleanups and small fixes (Rodrigo) - a few perf w/a from Ken Graunke - switch to atomic plane helpers (Matt Roper) - wc mmap support (Chris Wilson & Akash Goel) - smaller things all over * tag 'drm-intel-next-2015-01-17' of git://anongit.freedesktop.org/drm-intel: (40 commits) drm/i915: Update DRIVER_DATE to 20150117 i915: reuse %ph to dump small buffers drm/i915: Ensure the HiZ RAW Stall Optimization is on for Cherryview. drm/i915: Enable the HiZ RAW Stall Optimization on Broadwell. drm/i915: PSR link standby at debugfs drm/i915: group link_standby setup and let this info visible everywhere. drm/i915: Add missing vbt check. drm/i915: PSR HSW/BDW: Fix inverted logic at sink main_link_active bit. drm/i915: PSR VLV/CHV: Remove condition checks that only applies to Haswell. drm/i915: VLV/CHV PSR needs to exit PSR on every flush. drm/i915: Fix kerneldoc for i915 atomic plane code drm/i915: Don't pretend SDVO hotplug works on 915 drm/i915: Don't register HDMI connectors for eDP ports on VLV/CHV drm/i915: Remove I915_HAS_HOTPLUG() check from i915_hpd_irq_setup() drm/i915: Make hpd arrays big enough to avoid out of bounds access Revert "drm/i915/chv: Use timeout mode for RC6 on chv" drm/i915: Improve HiZ throughput on Cherryview. drm/i915: Reset CSB read pointer in ring init drm/i915: Drop unused position fields (v2) drm/i915: Move to atomic plane helpers (v9) ...
Showing the changes to include/uapi/drm (1 of 33 files). Show all
Unified · Split
| @@ -224,6 +224,8 @@ typedef struct _drm_i915_sarea { · 223 unmodified lines | ||
| 224 | 224 | #define DRM_I915_REG_READ 0x31 |
| 225 | 225 | #define DRM_I915_GET_RESET_STATS 0x32 |
| 226 | 226 | #define DRM_I915_GEM_USERPTR 0x33 |
| 227 | +#define DRM_I915_GEM_CONTEXT_GETPARAM 0x34 | |
| 228 | +#define DRM_I915_GEM_CONTEXT_SETPARAM 0x35 | |
| 227 | 229 | |
| 228 | 230 | #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) |
| 229 | 231 | #define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH) |
| @@ -275,6 +277,8 @@ typedef struct _drm_i915_sarea { · 45 unmodified lines | ||
| 275 | 277 | #define DRM_IOCTL_I915_REG_READ DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_REG_READ, struct drm_i915_reg_read) |
| 276 | 278 | #define DRM_IOCTL_I915_GET_RESET_STATS DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GET_RESET_STATS, struct drm_i915_reset_stats) |
| 277 | 279 | #define DRM_IOCTL_I915_GEM_USERPTR DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_USERPTR, struct drm_i915_gem_userptr) |
| 280 | +#define DRM_IOCTL_I915_GEM_CONTEXT_GETPARAM DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_GETPARAM, struct drm_i915_gem_context_param) | |
| 281 | +#define DRM_IOCTL_I915_GEM_CONTEXT_SETPARAM DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_SETPARAM, struct drm_i915_gem_context_param) | |
| 278 | 282 | |
| 279 | 283 | /* Allow drivers to submit batchbuffers directly to hardware, relying |
| 280 | 284 | * on the security mechanisms provided by hardware. |
| @@ -341,6 +345,7 @@ typedef struct drm_i915_irq_wait { · 60 unmodified lines | ||
| 341 | 345 | #define I915_PARAM_HAS_WT 27 |
| 342 | 346 | #define I915_PARAM_CMD_PARSER_VERSION 28 |
| 343 | 347 | #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29 |
| 348 | +#define I915_PARAM_MMAP_VERSION 30 | |
| 344 | 349 | |
| 345 | 350 | typedef struct drm_i915_getparam { |
| 346 | 351 | int param; |
| @@ -488,6 +493,14 @@ struct drm_i915_gem_mmap { · 141 unmodified lines | ||
| 488 | 493 | * This is a fixed-size type for 32/64 compatibility. |
| 489 | 494 | */ |
| 490 | 495 | __u64 addr_ptr; |
| 496 | + | |
| 497 | + /** | |
| 498 | + * Flags for extended behaviour. | |
| 499 | + * | |
| 500 | + * Added in version 2. | |
| 501 | + */ | |
| 502 | + __u64 flags; | |
| 503 | +#define I915_MMAP_WC 0x1 | |
| 491 | 504 | }; |
| 492 | 505 | |
| 493 | 506 | struct drm_i915_gem_mmap_gtt { |
| @@ -1073,4 +1086,12 @@ struct drm_i915_gem_userptr { · 579 unmodified lines | ||
| 1073 | 1086 | __u32 handle; |
| 1074 | 1087 | }; |
| 1075 | 1088 | |
| 1089 | +struct drm_i915_gem_context_param { | |
| 1090 | + __u32 ctx_id; | |
| 1091 | + __u32 size; | |
| 1092 | + __u64 param; | |
| 1093 | +#define I915_CONTEXT_PARAM_BAN_PERIOD 0x1 | |
| 1094 | + __u64 value; | |
| 1095 | +}; | |
| 1096 | + | |
| 1076 | 1097 | #endif /* _UAPI_I915_DRM_H_ */ |