OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel: Sync xe_drm.h

Browse Source 
Sync xe_drm.h with commit e51e857ffad4 ("drm/xe/uapi: Remove useless max_page_size").
Most relevant changes are the removal of max_page_size from
drm_xe_query_mem_region and the typo fix in XE_QUERY_CONFIG_MIN_ALIGNMENT.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25162>
This commit is contained in:
José Roberto de Souza
2023-09-11 14:02:28 -07:00
committed by Marge Bot
parent 69e3af2037
commit 79ba431d4a
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/drm-uapi/xe_drm.h
View File

@@ -174,10 +174,6 @@ struct drm_xe_query_mem_region {
* kernel.
*/
__u32 min_page_size;
/**
* @max_page_size: Max page-size in bytes for this region.
*/
__u32 max_page_size;
/**
* @total_size: The usable size in bytes for this region.
*/
@@ -256,7 +252,7 @@ struct drm_xe_query_config {
#define XE_QUERY_CONFIG_REV_AND_DEVICE_ID 0
#define XE_QUERY_CONFIG_FLAGS 1
#define XE_QUERY_CONFIG_FLAGS_HAS_VRAM (0x1 << 0)
#define XE_QUERY_CONFIG_MIN_ALIGNEMENT 2
#define XE_QUERY_CONFIG_MIN_ALIGNMENT 2
#define XE_QUERY_CONFIG_VA_BITS 3
#define XE_QUERY_CONFIG_GT_COUNT 4
#define XE_QUERY_CONFIG_MEM_REGION_COUNT 5
@@ -449,7 +445,6 @@ struct drm_xe_gem_create {
* If a VM is specified, this BO must:
*
* 1. Only ever be bound to that VM.
*
* 2. Cannot be exported as a PRIME fd.
*/
__u32 vm_id;
@@ -489,7 +484,7 @@ struct drm_xe_gem_mmap_offset {
* struct drm_xe_vm_bind_op_error_capture - format of VM bind op error capture
*/
struct drm_xe_vm_bind_op_error_capture {
/** @error: errno that occured */
/** @error: errno that occurred */
__s32 error;
/** @op: operation that encounter an error */
@@ -609,7 +604,7 @@ struct drm_xe_vm_bind_op {
* caused the error will be captured in drm_xe_vm_bind_op_error_capture.
* Once the user sees the error (via a ufence +
* XE_VM_PROPERTY_BIND_OP_ERROR_CAPTURE_ADDRESS), it should free memory
* via non-async unbinds, and then restart all queue'd async binds op via
* via non-async unbinds, and then restart all queued async binds op via
* XE_VM_BIND_OP_RESTART. Or alternatively the user should destroy the
* VM.
*
@@ -620,7 +615,7 @@ struct drm_xe_vm_bind_op {
#define XE_VM_BIND_FLAG_ASYNC (0x1 << 17)
/*
* Valid on a faulting VM only, do the MAP operation immediately rather
* than differing the MAP to the page fault handler.
* than deferring the MAP to the page fault handler.
*/
#define XE_VM_BIND_FLAG_IMMEDIATE (0x1 << 18)
/*
@@ -865,8 +860,8 @@ struct drm_xe_exec {
__u64 syncs;
/**
* @address: canonical address of batch buffer if num_batch_buffer == 1
* or an array of batch buffer canonical addresses
* @address: address of batch buffer if num_batch_buffer == 1 or an
* array of batch buffer addresses
*/
__u64 address;
@@ -907,7 +902,7 @@ struct drm_xe_mmio {
/**
* struct drm_xe_wait_user_fence - wait user fence
*
* Wait on user fence, XE will wakeup on every HW engine interrupt in the
* Wait on user fence, XE will wake-up on every HW engine interrupt in the
* instances list and check if user fence is complete::
*
* (*addr & MASK) OP (VALUE & MASK)
@@ -1039,9 +1034,11 @@ struct drm_xe_vm_madvise {
*/
#define DRM_XE_VM_MADVISE_PRIORITY 5
#define DRM_XE_VMA_PRIORITY_LOW 0
#define DRM_XE_VMA_PRIORITY_NORMAL 1 /* Default */
#define DRM_XE_VMA_PRIORITY_HIGH 2 /* Must be elevated user */
/* Pin the VMA in memory, must be elevated user */
/* Default */
#define DRM_XE_VMA_PRIORITY_NORMAL 1
/* Must be user with elevated privileges */
#define DRM_XE_VMA_PRIORITY_HIGH 2
/* Pin the VMA in memory, must be user with elevated privileges */
#define DRM_XE_VM_MADVISE_PIN 6
/** @property: property to set */
__u32 property;

2
src/intel/dev/xe/intel_device_info.c
View File

@@ -70,7 +70,7 @@ xe_query_config(int fd, struct intel_device_info *devinfo)
devinfo->revision = (config->info[XE_QUERY_CONFIG_REV_AND_DEVICE_ID] >> 16) & 0xFFFF;
devinfo->gtt_size = 1ull << config->info[XE_QUERY_CONFIG_VA_BITS];
devinfo->mem_alignment = config->info[XE_QUERY_CONFIG_MIN_ALIGNEMENT];
devinfo->mem_alignment = config->info[XE_QUERY_CONFIG_MIN_ALIGNMENT];
free(config);
return true;