headers: drm: Sync with drm-next
Subsystems (2)
PATCH 1/1 headers: drm: Sync with drm-next
Generated using make headers_install from the drm-next tree - git://anongit.freedesktop.org/drm/drm
branch - drm-next
commit - 8a02ea42bc1d4c448caf1bab0e05899dad503f74
The changes were as follows (shortlog from
b10733527bfd864605c33ab2e9a886eec317ec39..HEAD):
Aaron Liu (1):
drm/amdgpu: add uapi to define yellow carp series
Abdiel Janulgue (1):
drm/i915/query: Expose memory regions through the query uAPI
Alex Deucher (1):
drm/amdgpu: add INFO ioctl support for querying video caps (v4)
Chris Wilson (1):
drm/i915/gt: Track the overall awake/busy time
Christian Gmeiner (1):
drm/etnaviv: provide more ID values via GET_PARAM ioctl.
Felix Kuehling (1):
drm/amdgpu: Add new placement for preemptible SG BOs
Jason Ekstrand (1):
drm/i915/gem: Drop legacy execbuffer support (v2)
Jiawei Gu (1):
drm/amdgpu: Add vbios info ioctl interface
Jonathan Marek (2):
drm/msm: add MSM_BO_CACHED_COHERENT
drm/msm: deprecate MSM_BO_UNCACHED (map as writecombine instead)
Lionel Landwerlin (1):
drm: fix drm_mode_create_blob comment
Mario Kleiner (1):
drm/fourcc: Add 16 bpc fixed point framebuffer formats.
Matthew Auld (5):
drm/i915/uapi: fix kernel doc warnings drm/i915/uapi: convert i915_user_extension to kernel doc drm/i915/uapi: convert i915_query and friend to kernel doc drm/i915/uapi: introduce drm_i915_gem_create_ext drm/i915/uapi: implement object placement extension
Nirmoy Das (1):
drm/amdgpu: remove AMDGPU_GEM_CREATE_SHADOW flag
Noralf Trønnes (1):
drm/uapi: Add USB connector type
Radhakrishna Sripada (1):
drm/framebuffer: Format modifier for Intel Gen 12 render compression with Clear Color
Rob Clark (1):
drm/msm: Add param for userspace to query suspend count
Simon Ser (13):
drm: improve kernel-docs in drm_mode.h
drm: document drm_mode_get_connector
drm: document drm_mode_modeinfo
drm: document that user-space should force-probe connectors drm/doc: atomic implicitly enables other caps
drm/doc: re-format drm.h file comment
drm/doc: demote old doc-comments in drm.h
drm/fourcc: fix Amlogic format modifier masks
drm/uapi: document kernel capabilities
drm/connector: demote connector force-probes for non-master clients
drm: reference mode flags in DRM_CLIENT_CAP_* docs
drm: clarify and linkify DRM_CLIENT_CAP_WRITEBACK_CONNECTORS docs
drm: document minimum kernel version for DRM_CLIENT_CAP_*
Tvrtko Ursulin (1):
drm/i915/pmu: Deprecate I915_PMU_LAST and optimize state tracking
--- etnaviv/etnaviv_drm.h | 13 +- include/drm/amdgpu_drm.h | 18 +- include/drm/drm.h | 250 +++++++++--- include/drm/drm_fourcc.h | 32 +- include/drm/drm_mode.h | 168 ++++++-- include/drm/i915_drm.h | 862 +++++++++++++++++++++++++++++++++++++-- include/drm/msm_drm.h | 71 +++- 7 files changed, 1266 insertions(+), 148 deletions(-)
etnaviv/etnaviv_drm.h +12 -1
@@ -73,6 +73,10 @@ struct drm_etnaviv_timespec {#define ETNAVIV_PARAM_GPU_INSTRUCTION_COUNT 0x18#define ETNAVIV_PARAM_GPU_NUM_CONSTANTS 0x19#define ETNAVIV_PARAM_GPU_NUM_VARYINGS 0x1a +#define ETNAVIV_PARAM_SOFTPIN_START_ADDR 0x1b +#define ETNAVIV_PARAM_GPU_PRODUCT_ID 0x1c +#define ETNAVIV_PARAM_GPU_CUSTOMER_ID 0x1d +#define ETNAVIV_PARAM_GPU_ECO_ID 0x1e#define ETNA_MAX_PIPES 4
@@ -148,6 +152,11 @@ struct drm_etnaviv_gem_submit_reloc {* then patching the cmdstream for this entry is skipped. This can * avoid kernel needing to map/access the cmdstream bo in the common * case. +* If the submit is a softpin submit (ETNA_SUBMIT_SOFTPIN) the 'presumed' +* field is interpreted as the fixed location to map the bo into the gpu +* virtual address space. If the kernel is unable to map the buffer at +* this location the submit will fail. This means userspace is responsible +* for the whole gpu virtual address management. */ #define ETNA_SUBMIT_BO_READ 0x0001#define ETNA_SUBMIT_BO_WRITE 0x0002
@@ -177,9 +186,11 @@ struct drm_etnaviv_gem_submit_pmr {#define ETNA_SUBMIT_NO_IMPLICIT 0x0001#define ETNA_SUBMIT_FENCE_FD_IN 0x0002#define ETNA_SUBMIT_FENCE_FD_OUT 0x0004 +#define ETNA_SUBMIT_SOFTPIN 0x0008#define ETNA_SUBMIT_FLAGS (ETNA_SUBMIT_NO_IMPLICIT | \ ETNA_SUBMIT_FENCE_FD_IN | \ - ETNA_SUBMIT_FENCE_FD_OUT) + ETNA_SUBMIT_FENCE_FD_OUT| \ + ETNA_SUBMIT_SOFTPIN)#define ETNA_PIPE_3D 0x00#define ETNA_PIPE_2D 0x01#define ETNA_PIPE_VG 0x02
include/drm/amdgpu_drm.h +16 -2
@@ -116,8 +116,6 @@ extern "C" {#define AMDGPU_GEM_CREATE_CPU_GTT_USWC (1 << 2)/* Flag that the memory should be in VRAM and cleared */ #define AMDGPU_GEM_CREATE_VRAM_CLEARED (1 << 3) -/* Flag that create shadow bo(GTT) while allocating vram bo */ -#define AMDGPU_GEM_CREATE_SHADOW (1 << 4)/* Flag that allocating the BO should use linear VRAM */ #define AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS (1 << 5)/* Flag that BO is always valid in this VM */
@@ -138,6 +136,10 @@ extern "C" {* accessing it with various hw blocks */ #define AMDGPU_GEM_CREATE_ENCRYPTED (1 << 10) +/* Flag that BO will be used only in preemptible context, which does +* not require GTT memory accounting +*/ +#define AMDGPU_GEM_CREATE_PREEMPTIBLE (1 << 11)struct drm_amdgpu_gem_create_in {/** the requested memory size */
@@ -755,6 +757,8 @@ struct drm_amdgpu_cs_chunk_data {#define AMDGPU_INFO_VBIOS_SIZE 0x1/* Subquery id: Query vbios image */ #define AMDGPU_INFO_VBIOS_IMAGE 0x2 +/* Subquery id: Query vbios info */ +#define AMDGPU_INFO_VBIOS_INFO 0x3/* Query UVD handles */ #define AMDGPU_INFO_NUM_HANDLES 0x1C/* Query sensor related information */
@@ -948,6 +952,15 @@ struct drm_amdgpu_info_firmware {__u32 feature; }; +struct drm_amdgpu_info_vbios { +__u8 name[64 ]; +__u8 vbios_pn[64 ]; +__u32 version; +__u32 pad; +__u8 vbios_ver_str[32 ]; +__u8 date[32 ]; +}; +#define AMDGPU_VRAM_TYPE_UNKNOWN 0#define AMDGPU_VRAM_TYPE_GDDR1 1#define AMDGPU_VRAM_TYPE_DDR2 2
@@ -1121,6 +1134,7 @@ struct drm_amdgpu_info_video_caps {#define AMDGPU_FAMILY_RV 142/* Raven */ #define AMDGPU_FAMILY_NV 143/* Navi10 */ #define AMDGPU_FAMILY_VGH 144/* Van Gogh */ +#define AMDGPU_FAMILY_YC 146/* Yellow Carp */ #if defined(__cplusplus) }
include/drm/drm.h +194 -56
558 lines not on this page · raw message
include/drm/drm_fourcc.h +29 -3
@@ -168,6 +168,13 @@ extern "C" {#define DRM_FORMAT_RGBA1010102 fourcc_code('R', 'A', '3', '0')/* [31:0] R:G:B:A 10:10:10:2 little endian */ #define DRM_FORMAT_BGRA1010102 fourcc_code('B', 'A', '3', '0')/* [31:0] B:G:R:A 10:10:10:2 little endian */ +/* 64 bpp RGB */ +#define DRM_FORMAT_XRGB16161616 fourcc_code('X', 'R', '4', '8')/* [63:0] x:R:G:B 16:16:16:16 little endian */ +#define DRM_FORMAT_XBGR16161616 fourcc_code('X', 'B', '4', '8')/* [63:0] x:B:G:R 16:16:16:16 little endian */ + +#define DRM_FORMAT_ARGB16161616 fourcc_code('A', 'R', '4', '8')/* [63:0] A:R:G:B 16:16:16:16 little endian */ +#define DRM_FORMAT_ABGR16161616 fourcc_code('A', 'B', '4', '8')/* [63:0] A:B:G:R 16:16:16:16 little endian */ +/* * Floating point 64bpp RGB * IEEE 754-2008 binary16 half-precision float
@@ -474,7 +481,7 @@ extern "C" {* This is a tiled layout using 4Kb tiles in row-major layout. * Within the tile pixels are laid out in 16 256 byte units / sub-tiles which * are arranged in four groups (two wide, two high) with column-major layout. -* Each group therefore consists out of four 256 byte units, which are also laid +* Each group therefore consits out of four 256 byte units, which are also laid * out as 2x2 column-major. * 256 byte units are made out of four 64 byte blocks of pixels, producing * either a square block or a 2:1 unit.
@@ -527,6 +534,25 @@ extern "C" {*/ #define I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS fourcc_mod_code(INTEL, 7) +/* +* Intel Color Control Surface with Clear Color (CCS) for Gen-12 render +* compression. +* +* The main surface is Y-tiled and is at plane index 0 whereas CCS is linear +* and at index 1. The clear color is stored at index 2, and the pitch should +* be ignored. The clear color structure is 256 bits. The first 128 bits +* represents Raw Clear Color Red, Green, Blue and Alpha color each represented +* by 32 bits. The raw clear color is consumed by the 3d engine and generates +* the converted clear color of size 64 bits. The first 32 bits store the Lower +* Converted Clear Color value and the next 32 bits store the Higher Converted +* Clear Color value when applicable. The Converted Clear Color values are +* consumed by the DE. The last 64 bits are used to store Color Discard Enable +* and Depth Clear Value Valid which are ignored by the DE. A CCS cache line +* corresponds to an area of 4x1 tiles in the main surface. The main surface +* pitch is required to be a multiple of 4 tile widths. +*/ +#define I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC fourcc_mod_code(INTEL, 8) +/* * Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks *
@@ -1036,9 +1062,9 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)* Not all combinations are valid, and different SoCs may support different * combinations of layout and options. */ -#define __fourcc_mod_amlogic_layout_mask 0xf +#define __fourcc_mod_amlogic_layout_mask 0xff#define __fourcc_mod_amlogic_options_shift 8 -#define __fourcc_mod_amlogic_options_mask 0xf +#define __fourcc_mod_amlogic_options_mask 0xff#define DRM_FORMAT_MOD_AMLOGIC_FBC (__layout, __options) \ fourcc_mod_code(AMLOGIC, \
include/drm/drm_mode.h +127 -41
274 lines not on this page · raw message
include/drm/i915_drm.h +828 -34
1,114 lines not on this page · raw message
include/drm/msm_drm.h +60 -11
139 lines not on this page · raw message
Signature · 1 line
2.25.1
Quoted 7 lines · Mario Kleiner
Generated using make
headers_installfrom the drm-next tree -git://anongit.freedesktop.org/drm/drm
branch - drm-next
commit -8a02ea42bc1d4c448caf1bab0e05899dad503f74The changes were as follows (shortlog from
b10733527bfd864605c33ab2e9a886eec317ec39..HEAD):
libdrm uses GitLab merge requests now: https://gitlab.freedesktop.org/mesa/drm/-/merge_requests
Signature · 2 lines
Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer
Quoted 7 lines · Michel Dänzer
Quoted 5 lines · Mario Kleiner
Generated using make
headers_installfrom the drm-next tree -git://anongit.freedesktop.org/drm/drm
branch - drm-next
commit -8a02ea42bc1d4c448caf1bab0e05899dad503f74
Quoted 5 lines
Quoted 2 lines
The changes were as follows (shortlog from
b10733527bfd864605c33ab2e9a886eec317ec39..HEAD):libdrm uses GitLab merge requests now: https://gitlab.freedesktop.org/mesa/drm/-/merge_requests
Thanks for the info Michel. Merge request sent out. Maybe the Contributing doc needs some updates, as it describes a patch + mailing list workflow?
-mario