drm-intel-next-2015-03-13-rebased: - EU count report param for gen9+ (Jeff McGee) - piles of pll/wm/... fixes for chv, finally out of preliminary hw support (Ville, Vijay) - gen9 rps support from Akash - more work to move towards atomic from Matt, Ander and others - runtime pm support for skl (Damien) - edp1.4 intermediate link clock support (Sonika) - use frontbuffer tracking for fbc (Paulo) - remove ilk rc6 (John Harrison) - a bunch of smaller things and fixes all over Includes backmerge because git rerere couldn't keep up any more. * tag 'drm-intel-next-2015-03-13-merge' of git://anongit.freedesktop.org/drm-intel: (366 commits) drm/i915: Make sure the primary plane is enabled before reading out the fb state drm/i915: Update DRIVER_DATE to 20150313 drm/i915: Fix vmap_batch page iterator overrun drm/i915: Export total subslice and EU counts drm/i915: redefine WARN_ON_ONCE to include the condition drm/i915/skl: Implement WaDisableHBR2 drm/i915: Remove the preliminary_hw_support shackles from CHV drm/i915: Read CHV_PLL_DW8 from the correct offset drm/i915: Rewrite IVB FDI bifurcation conflict checks drm/i915: Rewrite some some of the FDI lane checks drm/i915/skl: Enable the RPS interrupts programming drm/i915/skl: Enabling processing of Turbo interrupts drm/i915/skl: Updated the i915_frequency_info debugfs function drm/i915: Simplify the way BC bifurcation state consistency is kept drm/i915/skl: Updated the act_freq_mhz_show sysfs function drm/i915/skl: Updated the gen9_enable_rps function drm/i915/skl: Updated the gen6_rps_limits function drm/i915/skl: Restructured the gen6_set_rps_thresholds function drm/i915/skl: Updated the gen6_set_rps function drm/i915/skl: Updated the gen6_init_rps_frequencies function ...
Showing the changes to include/uapi (2 of 290 files). Show all
Unified · Split
| @@ -151,7 +151,7 @@ · 150 unmodified lines | |||
| 151 | /* add more to the end as needed */ | 151 | /* add more to the end as needed */ |
| 152 | 152 | ||
| 153 | #define fourcc_mod_code(vendor, val) \ | 153 | #define fourcc_mod_code(vendor, val) \ |
| 154 | ((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffL)) | 154 | ((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL)) |
| 155 | 155 | ||
| 156 | /* | 156 | /* |
| 157 | * Format Modifier tokens: | 157 | * Format Modifier tokens: |
| @@ -347,6 +347,9 @@ typedef struct drm_i915_irq_wait { · 346 unmodified lines | |||
| 347 | #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29 | 347 | #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29 |
| 348 | #define I915_PARAM_MMAP_VERSION 30 | 348 | #define I915_PARAM_MMAP_VERSION 30 |
| 349 | #define I915_PARAM_HAS_BSD2 31 | 349 | #define I915_PARAM_HAS_BSD2 31 |
| 350 | #define I915_PARAM_REVISION 32 | ||
| 351 | #define I915_PARAM_SUBSLICE_TOTAL 33 | ||
| 352 | #define I915_PARAM_EU_TOTAL 34 | ||
| 350 | 353 | ||
| 351 | typedef struct drm_i915_getparam { | 354 | typedef struct drm_i915_getparam { |
| 352 | int param; | 355 | int param; |