diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-28 20:49:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-28 20:49:53 -0400 |
| commit | 53b3b6bbfde6aae8d1ededc86ad4e0e1e00eb5f8 (patch) | |
| tree | b29473f21270aefd113b298c9402be8b4b3c91b4 /include/uapi/drm | |
| parent | 746bb4ed6d626f3f9e431a7f9b20504538e62ded (diff) | |
| parent | f2bfc71aee75feff33ca659322b72ffeed5a243d (diff) | |
Merge tag 'drm-next-2018-10-24' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie:
"This is going to rebuild more than drm as it adds a new helper to
list.h for doing bulk updates. Seemed like a reasonable addition to
me.
Otherwise the usual merge window stuff lots of i915 and amdgpu, not so
much nouveau, and piles of everything else.
Core:
- Adds a new list.h helper for doing bulk list updates for TTM.
- Don't leak fb address in smem_start to userspace (comes with EXPORT
workaround for people using mali out of tree hacks)
- udmabuf device to turn memfd regions into dma-buf
- Per-plane blend mode property
- ref/unref replacements with get/put
- fbdev conflicting framebuffers code cleaned up
- host-endian format variants
- panel orientation quirk for Acer One 10
bridge:
- TI SN65DSI86 chip support
vkms:
- GEM support.
- Cursor support
amdgpu:
- Merge amdkfd and amdgpu into one module
- CEC over DP AUX support
- Picasso APU support + VCN dynamic powergating
- Raven2 APU support
- Vega20 enablement + kfd support
- ACP powergating improvements
- ABGR/XBGR display support
- VCN jpeg support
- xGMI support
- DC i2c/aux cleanup
- Ycbcr 4:2:0 support
- GPUVM improvements
- Powerplay and powerplay endian fixes
- Display underflow fixes
vmwgfx:
- Move vmwgfx specific TTM code to vmwgfx
- Split out vmwgfx buffer/resource validation code
- Atomic operation rework
bochs:
- use more helpers
- format/byteorder improvements
qxl:
- use more helpers
i915:
- GGTT coherency getparam
- Turn off resource streamer API
- More Icelake enablement + DMC firmware
- Full PPGTT for Ivybridge, Haswell and Valleyview
- DDB distribution based on resolution
- Limited range DP display support
nouveau:
- CEC over DP AUX support
- Initial HDMI 2.0 support
virtio-gpu:
- vmap support for PRIME objects
tegra:
- Initial Tegra194 support
- DMA/IOMMU integration fixes
msm:
- a6xx perf improvements + clock prefix
- GPU preemption optimisations
- a6xx devfreq support
- cursor support
rockchip:
- PX30 support
- rgb output interface support
mediatek:
- HDMI output support on mt2701 and mt7623
rcar-du:
- Interlaced modes on Gen3
- LVDS on R8A77980
- D3 and E3 SoC support
hisilicon:
- misc fixes
mxsfb:
- runtime pm support
sun4i:
- R40 TCON support
- Allwinner A64 support
- R40 HDMI support
omapdrm:
- Driver rework changing display pipeline ordering to use common code
- DMM memory barrier and irq fixes
- Errata workarounds
exynos:
- out-bridge support for LVDS bridge driver
- Samsung 16x16 tiled format support
- Plane alpha and pixel blend mode support
tilcdc:
- suspend/resume update
mali-dp:
- misc updates"
* tag 'drm-next-2018-10-24' of git://anongit.freedesktop.org/drm/drm: (1382 commits)
firmware/dmc/icl: Add missing MODULE_FIRMWARE() for Icelake.
drm/i915/icl: Fix signal_levels
drm/i915/icl: Fix DDI/TC port clk_off bits
drm/i915/icl: create function to identify combophy port
drm/i915/gen9+: Fix initial readout for Y tiled framebuffers
drm/i915: Large page offsets for pread/pwrite
drm/i915/selftests: Disable shrinker across mmap-exhaustion
drm/i915/dp: Link train Fallback on eDP only if fallback link BW can fit panel's native mode
drm/i915: Fix intel_dp_mst_best_encoder()
drm/i915: Skip vcpi allocation for MSTB ports that are gone
drm/i915: Don't unset intel_connector->mst_port
drm/i915: Only reset seqno if actually idle
drm/i915: Use the correct crtc when sanitizing plane mapping
drm/i915: Restore vblank interrupts earlier
drm/i915: Check fb stride against plane max stride
drm/amdgpu/vcn:Fix uninitialized symbol error
drm: panel-orientation-quirks: Add quirk for Acer One 10 (S1003)
drm/amd/amdgpu: Fix debugfs error handling
drm/amdgpu: Update gc_9_0 golden settings.
drm/amd/powerplay: update PPtable with DC BTC and Tvr SocLimit fields
...
Diffstat (limited to 'include/uapi/drm')
| -rw-r--r-- | include/uapi/drm/amdgpu_drm.h | 2 | ||||
| -rw-r--r-- | include/uapi/drm/drm_fourcc.h | 48 | ||||
| -rw-r--r-- | include/uapi/drm/drm_mode.h | 3 | ||||
| -rw-r--r-- | include/uapi/drm/i915_drm.h | 22 |
4 files changed, 74 insertions, 1 deletions
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h index 1ceec56de015..370e9a5536ef 100644 --- a/include/uapi/drm/amdgpu_drm.h +++ b/include/uapi/drm/amdgpu_drm.h | |||
| @@ -665,6 +665,8 @@ struct drm_amdgpu_cs_chunk_data { | |||
| 665 | #define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_GPM_MEM 0x10 | 665 | #define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_GPM_MEM 0x10 |
| 666 | /* Subquery id: Query GFX RLC SRLS firmware version */ | 666 | /* Subquery id: Query GFX RLC SRLS firmware version */ |
| 667 | #define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_SRM_MEM 0x11 | 667 | #define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_SRM_MEM 0x11 |
| 668 | /* Subquery id: Query DMCU firmware version */ | ||
| 669 | #define AMDGPU_INFO_FW_DMCU 0x12 | ||
| 668 | /* number of bytes moved for TTM migration */ | 670 | /* number of bytes moved for TTM migration */ |
| 669 | #define AMDGPU_INFO_NUM_BYTES_MOVED 0x0f | 671 | #define AMDGPU_INFO_NUM_BYTES_MOVED 0x0f |
| 670 | /* the used VRAM size */ | 672 | /* the used VRAM size */ |
diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 721ab7e54d96..0cd40ebfa1b1 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h | |||
| @@ -30,11 +30,50 @@ | |||
| 30 | extern "C" { | 30 | extern "C" { |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | /** | ||
| 34 | * DOC: overview | ||
| 35 | * | ||
| 36 | * In the DRM subsystem, framebuffer pixel formats are described using the | ||
| 37 | * fourcc codes defined in `include/uapi/drm/drm_fourcc.h`. In addition to the | ||
| 38 | * fourcc code, a Format Modifier may optionally be provided, in order to | ||
| 39 | * further describe the buffer's format - for example tiling or compression. | ||
| 40 | * | ||
| 41 | * Format Modifiers | ||
| 42 | * ---------------- | ||
| 43 | * | ||
| 44 | * Format modifiers are used in conjunction with a fourcc code, forming a | ||
| 45 | * unique fourcc:modifier pair. This format:modifier pair must fully define the | ||
| 46 | * format and data layout of the buffer, and should be the only way to describe | ||
| 47 | * that particular buffer. | ||
| 48 | * | ||
| 49 | * Having multiple fourcc:modifier pairs which describe the same layout should | ||
| 50 | * be avoided, as such aliases run the risk of different drivers exposing | ||
| 51 | * different names for the same data format, forcing userspace to understand | ||
| 52 | * that they are aliases. | ||
| 53 | * | ||
| 54 | * Format modifiers may change any property of the buffer, including the number | ||
| 55 | * of planes and/or the required allocation size. Format modifiers are | ||
| 56 | * vendor-namespaced, and as such the relationship between a fourcc code and a | ||
| 57 | * modifier is specific to the modifer being used. For example, some modifiers | ||
| 58 | * may preserve meaning - such as number of planes - from the fourcc code, | ||
| 59 | * whereas others may not. | ||
| 60 | * | ||
| 61 | * Vendors should document their modifier usage in as much detail as | ||
| 62 | * possible, to ensure maximum compatibility across devices, drivers and | ||
| 63 | * applications. | ||
| 64 | * | ||
| 65 | * The authoritative list of format modifier codes is found in | ||
| 66 | * `include/uapi/drm/drm_fourcc.h` | ||
| 67 | */ | ||
| 68 | |||
| 33 | #define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \ | 69 | #define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \ |
| 34 | ((__u32)(c) << 16) | ((__u32)(d) << 24)) | 70 | ((__u32)(c) << 16) | ((__u32)(d) << 24)) |
| 35 | 71 | ||
| 36 | #define DRM_FORMAT_BIG_ENDIAN (1<<31) /* format is big endian instead of little endian */ | 72 | #define DRM_FORMAT_BIG_ENDIAN (1<<31) /* format is big endian instead of little endian */ |
| 37 | 73 | ||
| 74 | /* Reserve 0 for the invalid format specifier */ | ||
| 75 | #define DRM_FORMAT_INVALID 0 | ||
| 76 | |||
| 38 | /* color index */ | 77 | /* color index */ |
| 39 | #define DRM_FORMAT_C8 fourcc_code('C', '8', ' ', ' ') /* [7:0] C */ | 78 | #define DRM_FORMAT_C8 fourcc_code('C', '8', ' ', ' ') /* [7:0] C */ |
| 40 | 79 | ||
| @@ -300,6 +339,15 @@ extern "C" { | |||
| 300 | #define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE fourcc_mod_code(SAMSUNG, 1) | 339 | #define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE fourcc_mod_code(SAMSUNG, 1) |
| 301 | 340 | ||
| 302 | /* | 341 | /* |
| 342 | * Tiled, 16 (pixels) x 16 (lines) - sized macroblocks | ||
| 343 | * | ||
| 344 | * This is a simple tiled layout using tiles of 16x16 pixels in a row-major | ||
| 345 | * layout. For YCbCr formats Cb/Cr components are taken in such a way that | ||
| 346 | * they correspond to their 16x16 luma block. | ||
| 347 | */ | ||
| 348 | #define DRM_FORMAT_MOD_SAMSUNG_16_16_TILE fourcc_mod_code(SAMSUNG, 2) | ||
| 349 | |||
| 350 | /* | ||
| 303 | * Qualcomm Compressed Format | 351 | * Qualcomm Compressed Format |
| 304 | * | 352 | * |
| 305 | * Refers to a compressed variant of the base format that is compressed. | 353 | * Refers to a compressed variant of the base format that is compressed. |
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 8d67243952f4..d3e0fe31efc5 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h | |||
| @@ -186,8 +186,9 @@ extern "C" { | |||
| 186 | /* | 186 | /* |
| 187 | * DRM_MODE_REFLECT_<axis> | 187 | * DRM_MODE_REFLECT_<axis> |
| 188 | * | 188 | * |
| 189 | * Signals that the contents of a drm plane is reflected in the <axis> axis, | 189 | * Signals that the contents of a drm plane is reflected along the <axis> axis, |
| 190 | * in the same way as mirroring. | 190 | * in the same way as mirroring. |
| 191 | * See kerneldoc chapter "Plane Composition Properties" for more details. | ||
| 191 | * | 192 | * |
| 192 | * This define is provided as a convenience, looking up the property id | 193 | * This define is provided as a convenience, looking up the property id |
| 193 | * using the name->prop id lookup is the preferred method. | 194 | * using the name->prop id lookup is the preferred method. |
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 7f5634ce8e88..a4446f452040 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h | |||
| @@ -529,6 +529,28 @@ typedef struct drm_i915_irq_wait { | |||
| 529 | */ | 529 | */ |
| 530 | #define I915_PARAM_CS_TIMESTAMP_FREQUENCY 51 | 530 | #define I915_PARAM_CS_TIMESTAMP_FREQUENCY 51 |
| 531 | 531 | ||
| 532 | /* | ||
| 533 | * Once upon a time we supposed that writes through the GGTT would be | ||
| 534 | * immediately in physical memory (once flushed out of the CPU path). However, | ||
| 535 | * on a few different processors and chipsets, this is not necessarily the case | ||
| 536 | * as the writes appear to be buffered internally. Thus a read of the backing | ||
| 537 | * storage (physical memory) via a different path (with different physical tags | ||
| 538 | * to the indirect write via the GGTT) will see stale values from before | ||
| 539 | * the GGTT write. Inside the kernel, we can for the most part keep track of | ||
| 540 | * the different read/write domains in use (e.g. set-domain), but the assumption | ||
| 541 | * of coherency is baked into the ABI, hence reporting its true state in this | ||
| 542 | * parameter. | ||
| 543 | * | ||
| 544 | * Reports true when writes via mmap_gtt are immediately visible following an | ||
| 545 | * lfence to flush the WCB. | ||
| 546 | * | ||
| 547 | * Reports false when writes via mmap_gtt are indeterminately delayed in an in | ||
| 548 | * internal buffer and are _not_ immediately visible to third parties accessing | ||
| 549 | * directly via mmap_cpu/mmap_wc. Use of mmap_gtt as part of an IPC | ||
| 550 | * communications channel when reporting false is strongly disadvised. | ||
| 551 | */ | ||
| 552 | #define I915_PARAM_MMAP_GTT_COHERENT 52 | ||
| 553 | |||
| 532 | typedef struct drm_i915_getparam { | 554 | typedef struct drm_i915_getparam { |
| 533 | __s32 param; | 555 | __s32 param; |
| 534 | /* | 556 | /* |
