History

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 ...

Linus Torvalds committed 8 years ago

Commit 53b3b6b2 parents 746bb4e f2bfc71893 files · +107740 −25645Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/kfd_ioctl.h +12 −1
  2. include/uapi/linux/udmabuf.h +33 −0
include/uapi/linux/kfd_ioctl.h+12−1
@@ -82,6 +82,14 @@ struct kfd_ioctl_set_cu_mask_args { · 81 unmodified lines
8282 __u64 cu_mask_ptr; /* to KFD */
8383 };
8484
85+struct kfd_ioctl_get_queue_wave_state_args {
86+ uint64_t ctl_stack_address; /* to KFD */
87+ uint32_t ctl_stack_used_size; /* from KFD */
88+ uint32_t save_area_used_size; /* from KFD */
89+ uint32_t queue_id; /* to KFD */
90+ uint32_t pad;
91+};
92+
8593 /* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */
8694 #define KFD_IOC_CACHE_POLICY_COHERENT 0
8795 #define KFD_IOC_CACHE_POLICY_NONCOHERENT 1
@@ -475,7 +483,10 @@ struct kfd_ioctl_unmap_memory_from_gpu_args { · 387 unmodified lines
475483 #define AMDKFD_IOC_SET_CU_MASK \
476484 AMDKFD_IOW(0x1A, struct kfd_ioctl_set_cu_mask_args)
477485
486+#define AMDKFD_IOC_GET_QUEUE_WAVE_STATE \
487+ AMDKFD_IOWR(0x1B, struct kfd_ioctl_get_queue_wave_state_args)
488+
478489 #define AMDKFD_COMMAND_START 0x01
479−#define AMDKFD_COMMAND_END 0x1B
490+#define AMDKFD_COMMAND_END 0x1C
480491
481492 #endif
include/uapi/linux/udmabuf.h+33−0
@@ -0,0 +1,33 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2+#ifndef _UAPI_LINUX_UDMABUF_H
3+#define _UAPI_LINUX_UDMABUF_H
4+
5+#include <linux/types.h>
6+#include <linux/ioctl.h>
7+
8+#define UDMABUF_FLAGS_CLOEXEC 0x01
9+
10+struct udmabuf_create {
11+ __u32 memfd;
12+ __u32 flags;
13+ __u64 offset;
14+ __u64 size;
15+};
16+
17+struct udmabuf_create_item {
18+ __u32 memfd;
19+ __u32 __pad;
20+ __u64 offset;
21+ __u64 size;
22+};
23+
24+struct udmabuf_create_list {
25+ __u32 flags;
26+ __u32 count;
27+ struct udmabuf_create_item list[];
28+};
29+
30+#define UDMABUF_CREATE _IOW('u', 0x42, struct udmabuf_create)
31+#define UDMABUF_CREATE_LIST _IOW('u', 0x43, struct udmabuf_create_list)
32+
33+#endif /* _UAPI_LINUX_UDMABUF_H */