include/drm-uapi: bump headers
From drm-next at the following commit: commit 2a7005c8a3982ba27fab237d85c27da446484e9c (HEAD) Merge: 0666cba1f5b2b 47c65b3853f88 Author: Dave Airlie <airlied@redhat.com> Date: Fri Jun 11 13:34:42 2021 +1000 Merge tag 'drm-intel-gt-next-2021-06-10' of... Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5599>
This commit is contained in:

committed by
Marge Bot

parent
2fe2eb1911
commit
8dc3c91a5c
@@ -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)
|
||||
}
|
||||
|
Reference in New Issue
Block a user