History

Merge tag 'drm-misc-next-2021-09-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for $kernel-version: UAPI Changes: Cross-subsystem Changes: - dma-buf: Avoid a warning with some allocations, Remove DMA_FENCE_TRACE macros Core Changes: - bridge: New helper to git rid of panels in drivers - fence: Improve dma_fence_add_callback documentation, Improve dma_fence_ops->wait documentation - ioctl: Unexport drm_ioctl_permit - lease: Documentation improvements - fourcc: Add new macro to determine the modifier vendor - quirks: Add the Steam Deck, Chuwi HiBook, Chuwi Hi10 Pro, Samsung Galaxy Book 10.6, KD Kurio Smart C15200 2-in-1, Lenovo Ideapad D330 - resv: Improve the documentation - shmem-helpers: Allocate WC pages on x86, Switch to vmf_insert_pfn - sched: Fix for a timer being canceled too soon, Avoid null pointer derefence if the fence is null in drm_sched_fence_free, Convert drivers to rely on its dependency tracking - ttm: Switch to kerneldoc, new helper to clear all DMA mappings, pool shrinker optitimization, Remove ttm_tt_destroy_common, Fix for unbinding on multiple drivers Driver Changes: - bochs: New PCI IDs - msm: Fence ordering impromevemnts - stm: Add layer alpha support, zpos - v3d: Fix for a Vulkan CTS failure - vc4: Conversion to the new bridge helpers - vgem: Use shmem helpers - virtio: Support mapping exported vram - zte: Remove obsolete driver - bridge: Probe improvements for it66121, enable DSI EOTP for anx7625, errors propagation improvements for anx7625 - panels: 60fps mode for otm8009a, New driver for Samsung S6D27A1 Signed-off-by: Dave Airlie <airlied@redhat.com> # gpg: Signature made Thu 16 Sep 2021 17:30:50 AEST # gpg: using EDDSA key 5C1337A45ECA9AEB89060E9EE3EF0D6F671851C5 # gpg: Can't check signature: No public key From: Maxime Ripard <maxime@cerno.tech> Link: https://patchwork.freedesktop.org/patch/msgid/20210916073132.ptbbmjetm7v3ufq3@gilmour

Dave Airlie committed 5 years ago

Commit 0dfc7082 parents e4e737b e4f8681145 files · +2080 −5441Browse files

Showing the changes to include/uapi (2 of 145 files). Show all

Unified · Split

2 files
  1. include/uapi/drm/drm_fourcc.h +6 −0
  2. include/uapi/drm/drm_mode.h +3 −0
include/uapi/drm/drm_fourcc.h+6−0
@@ -373,6 +373,12 @@ extern "C" { · 372 unmodified lines
373 373
374#define DRM_FORMAT_RESERVED ((1ULL << 56) - 1)374#define DRM_FORMAT_RESERVED ((1ULL << 56) - 1)
375 375
376#define fourcc_mod_get_vendor(modifier) \
377 (((modifier) >> 56) & 0xff)
378
379#define fourcc_mod_is_vendor(modifier, vendor) \
380 (fourcc_mod_get_vendor(modifier) == DRM_FORMAT_MOD_VENDOR_## vendor)
381
376#define fourcc_mod_code(vendor, val) \382#define fourcc_mod_code(vendor, val) \
377 ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | ((val) & 0x00ffffffffffffffULL))383 ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | ((val) & 0x00ffffffffffffffULL))
378 384
include/uapi/drm/drm_mode.h+3−0
@@ -1110,6 +1110,9 @@ struct drm_mode_destroy_blob { · 1109 unmodified lines
1110 * struct drm_mode_create_lease - Create lease1110 * struct drm_mode_create_lease - Create lease
1111 *1111 *
1112 * Lease mode resources, creating another drm_master.1112 * Lease mode resources, creating another drm_master.
1113 *
1114 * The @object_ids array must reference at least one CRTC, one connector and
1115 * one plane if &DRM_CLIENT_CAP_UNIVERSAL_PLANES is enabled.
1113 */1116 */
1114struct drm_mode_create_lease {1117struct drm_mode_create_lease {
1115 /** @object_ids: Pointer to array of object ids (__u32) */1118 /** @object_ids: Pointer to array of object ids (__u32) */