History

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

- refactor ddi buffer programming a bit (Ville) - large-scale renaming to untangle naming in the gem code (Chris) - rework vma/active tracking for accurately reaping idle mappings of shared objects (Chris) - misc dp sst/mst probing corner case fixes (Ville) - tons of cleanup&tunings all around in gem - lockless (rcu-protected) request lookup, plus use it everywhere for non(b)locking waits (Chris) - pipe crc debugfs fixes (Rodrigo) - random fixes all over * tag 'drm-intel-next-2016-08-08' of git://anongit.freedesktop.org/drm-intel: (222 commits) drm/i915: Update DRIVER_DATE to 20160808 drm/i915: fix aliasing_ppgtt leak drm/i915: Update comment before i915_spin_request drm/i915: Use drm official vblank_no_hw_counter callback. drm/i915: Fix copy_to_user usage for pipe_crc Revert "drm/i915: Track active streams also for DP SST" drm/i915: fix WaInsertDummyPushConstPs drm/i915: Assert that the request hasn't been retired drm/i915: Repack fence tiling mode and stride into a single integer drm/i915: Document and reject invalid tiling modes drm/i915: Remove locking for get_tiling drm/i915: Remove pinned check from madvise ioctl drm/i915: Reduce locking inside swfinish ioctl drm/i915: Remove (struct_mutex) locking for busy-ioctl drm/i915: Remove (struct_mutex) locking for wait-ioctl drm/i915: Do a nonblocking wait first in pread/pwrite drm/i915: Remove unused no-shrinker-steal drm/i915: Tidy generation of the GTT mmap offset drm/i915/shrinker: Wait before acquiring struct_mutex under oom drm/i915: Simplify do_idling() (Ironlake vt-d w/a) ...

Dave Airlie committed 10 years ago

Commit fc93ff62 parents f8725ad c5b7e9762 files · +6280 −5999Browse files

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

Unified · Split

include/uapi/drm/i915_drm.h+36−6
@@ -62,6 +62,30 @@ extern "C" { · 61 unmodified lines
62#define I915_ERROR_UEVENT "ERROR"62#define I915_ERROR_UEVENT "ERROR"
63#define I915_RESET_UEVENT "RESET"63#define I915_RESET_UEVENT "RESET"
64 64
65/*
66 * MOCS indexes used for GPU surfaces, defining the cacheability of the
67 * surface data and the coherency for this data wrt. CPU vs. GPU accesses.
68 */
69enum i915_mocs_table_index {
70 /*
71 * Not cached anywhere, coherency between CPU and GPU accesses is
72 * guaranteed.
73 */
74 I915_MOCS_UNCACHED,
75 /*
76 * Cacheability and coherency controlled by the kernel automatically
77 * based on the DRM_I915_GEM_SET_CACHING IOCTL setting and the current
78 * usage of the surface (used for display scanout or not).
79 */
80 I915_MOCS_PTE,
81 /*
82 * Cached in all GPU caches available on the platform.
83 * Coherency between CPU and GPU accesses to the surface is not
84 * guaranteed without extra synchronization.
85 */
86 I915_MOCS_CACHED,
87};
88
65/* Each region is a minimum of 16k, and there are at most 255 of them.89/* Each region is a minimum of 16k, and there are at most 255 of them.
66 */90 */
67#define I915_NR_TEX_REGIONS 255 /* table size 2k - maximum due to use91#define I915_NR_TEX_REGIONS 255 /* table size 2k - maximum due to use
@@ -698,15 +722,20 @@ struct drm_i915_gem_exec_object2 { · 630 unmodified lines
698 */722 */
699 __u64 offset;723 __u64 offset;
700 724
701#define EXEC_OBJECT_NEEDS_FENCE (1<<0)725#define EXEC_OBJECT_NEEDS_FENCE (1<<0)
702#define EXEC_OBJECT_NEEDS_GTT (1<<1)726#define EXEC_OBJECT_NEEDS_GTT (1<<1)
703#define EXEC_OBJECT_WRITE (1<<2)727#define EXEC_OBJECT_WRITE (1<<2)
704#define EXEC_OBJECT_SUPPORTS_48B_ADDRESS (1<<3)728#define EXEC_OBJECT_SUPPORTS_48B_ADDRESS (1<<3)
705#define EXEC_OBJECT_PINNED (1<<4)729#define EXEC_OBJECT_PINNED (1<<4)
706#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_PINNED<<1)730#define EXEC_OBJECT_PAD_TO_SIZE (1<<5)
731/* All remaining bits are MBZ and RESERVED FOR FUTURE USE */
732#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_PAD_TO_SIZE<<1)
707 __u64 flags;733 __u64 flags;
708 734
709 __u64 rsvd1;735 union {
736 __u64 rsvd1;
737 __u64 pad_to_size;
738 };
710 __u64 rsvd2;739 __u64 rsvd2;
711};740};
712 741
@@ -897,6 +926,7 @@ struct drm_i915_gem_caching { · 184 unmodified lines
897#define I915_TILING_NONE 0926#define I915_TILING_NONE 0
898#define I915_TILING_X 1927#define I915_TILING_X 1
899#define I915_TILING_Y 2928#define I915_TILING_Y 2
929#define I915_TILING_LAST I915_TILING_Y
900 930
901#define I915_BIT_6_SWIZZLE_NONE 0931#define I915_BIT_6_SWIZZLE_NONE 0
902#define I915_BIT_6_SWIZZLE_9 1932#define I915_BIT_6_SWIZZLE_9 1

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