History

Merge tag 'drm-intel-next-fixes-2015-05-29' of git://anongit.freedesktop.org/drm-intel into drm-next

Fixes for 4.2. Nothing too serious (given that it's still pre merge window). With that it's off for 2 weeks of vacation for me and taking care of 4.2 fixes for Jani. * tag 'drm-intel-next-fixes-2015-05-29' of git://anongit.freedesktop.org/drm-intel: drm/i915: limit PPGTT size to 2GB in 32-bit platforms drm/i915: Another fbdev hack to avoid PSR on fbcon. drm/i915: Return the frontbuffer flip to enable intel_crtc_enable_planes. drm/i915: disable IPS while getting the sink CRCs drm/i915: Disable 12bpc hdmi for now drm/i915: Adjust sideband locking a bit for CHV/VLV drm/i915: s/dpio_lock/sb_lock/ drm/i915: Kill intel_flush_primary_plane() drm/i915: Throw out WIP CHV power well definitions drm/i915: Use the default 600ns LDO programming sequence delay drm/i915: Remove unnecessary null check in execlists_context_unqueue drm/i915: Use spinlocks for checking when to waitboost drm/i915: Fix the confusing comment about the ioctl limits Revert "drm/i915: Force clean compilation with -Werror"

Dave Airlie committed 11 years ago

Commit 3e8d2222 parents 1c34d82 501fd7024 files · +247 −297Browse files

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

Unified · Split

include/uapi/drm/i915_drm.h+6−2
@@ -171,8 +171,12 @@ typedef struct _drm_i915_sarea { · 170 unmodified lines
171#define I915_BOX_TEXTURE_LOAD 0x8171#define I915_BOX_TEXTURE_LOAD 0x8
172#define I915_BOX_LOST_CONTEXT 0x10172#define I915_BOX_LOST_CONTEXT 0x10
173 173
174/* I915 specific ioctls174/*
175 * The device specific ioctl range is 0x40 to 0x79.175 * i915 specific ioctls.
176 *
177 * The device specific ioctl range is [DRM_COMMAND_BASE, DRM_COMMAND_END) ie
178 * [0x40, 0xa0) (a0 is excluded). The numbers below are defined as offset
179 * against DRM_COMMAND_BASE and should be between [0x0, 0x60).
176 */180 */
177#define DRM_I915_INIT 0x00181#define DRM_I915_INIT 0x00
178#define DRM_I915_FLUSH 0x01182#define DRM_I915_FLUSH 0x01