Skip to content

Commit ce49713

Browse files
Shaoyun Liualexdeucher
authored andcommitted
drm/amd : Update MES API header file for v11 & v12
New features require the new fields defines Signed-off-by: Shaoyun Liu <shaoyun.liu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent af5661c commit ce49713

File tree

2 files changed

+72
-2
lines changed

2 files changed

+72
-2
lines changed

drivers/gpu/drm/amd/include/mes_v11_api_def.h

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,23 @@ union MESAPI_SET_HW_RESOURCES {
230230
uint32_t disable_add_queue_wptr_mc_addr : 1;
231231
uint32_t enable_mes_event_int_logging : 1;
232232
uint32_t enable_reg_active_poll : 1;
233-
uint32_t reserved : 21;
233+
uint32_t use_disable_queue_in_legacy_uq_preemption : 1;
234+
uint32_t send_write_data : 1;
235+
uint32_t os_tdr_timeout_override : 1;
236+
uint32_t use_rs64mem_for_proc_gang_ctx : 1;
237+
uint32_t use_add_queue_unmap_flag_addr : 1;
238+
uint32_t enable_mes_sch_stb_log : 1;
239+
uint32_t limit_single_process : 1;
240+
uint32_t is_strix_tmz_wa_enabled :1;
241+
uint32_t reserved : 13;
234242
};
235243
uint32_t uint32_t_all;
236244
};
237245
uint32_t oversubscription_timer;
238246
uint64_t doorbell_info;
239247
uint64_t event_intr_history_gpu_mc_ptr;
248+
uint64_t timestamp;
249+
uint32_t os_tdr_timeout_in_sec;
240250
};
241251

242252
uint32_t max_dwords_in_api[API_FRAME_SIZE_IN_DWORDS];
@@ -563,6 +573,11 @@ enum MESAPI_MISC_OPCODE {
563573
MESAPI_MISC__READ_REG,
564574
MESAPI_MISC__WAIT_REG_MEM,
565575
MESAPI_MISC__SET_SHADER_DEBUGGER,
576+
MESAPI_MISC__NOTIFY_WORK_ON_UNMAPPED_QUEUE,
577+
MESAPI_MISC__NOTIFY_TO_UNMAP_PROCESSES,
578+
MESAPI_MISC__CHANGE_CONFIG,
579+
MESAPI_MISC__LAUNCH_CLEANER_SHADER,
580+
566581
MESAPI_MISC__MAX,
567582
};
568583

@@ -617,6 +632,31 @@ struct SET_SHADER_DEBUGGER {
617632
uint32_t trap_en;
618633
};
619634

635+
enum MESAPI_MISC__CHANGE_CONFIG_OPTION {
636+
MESAPI_MISC__CHANGE_CONFIG_OPTION_LIMIT_SINGLE_PROCESS = 0,
637+
MESAPI_MISC__CHANGE_CONFIG_OPTION_ENABLE_HWS_LOGGING_BUFFER = 1,
638+
MESAPI_MISC__CHANGE_CONFIG_OPTION_CHANGE_TDR_CONFIG = 2,
639+
640+
MESAPI_MISC__CHANGE_CONFIG_OPTION_MAX = 0x1F
641+
};
642+
643+
struct CHANGE_CONFIG {
644+
enum MESAPI_MISC__CHANGE_CONFIG_OPTION opcode;
645+
union {
646+
struct {
647+
uint32_t limit_single_process : 1;
648+
uint32_t enable_hws_logging_buffer : 1;
649+
uint32_t reserved : 31;
650+
} bits;
651+
uint32_t all;
652+
} option;
653+
654+
struct {
655+
uint32_t tdr_level;
656+
uint32_t tdr_delay;
657+
} tdr_config;
658+
};
659+
620660
union MESAPI__MISC {
621661
struct {
622662
union MES_API_HEADER header;
@@ -631,6 +671,7 @@ union MESAPI__MISC {
631671
struct WAIT_REG_MEM wait_reg_mem;
632672
struct SET_SHADER_DEBUGGER set_shader_debugger;
633673
enum MES_AMD_PRIORITY_LEVEL queue_sch_level;
674+
struct CHANGE_CONFIG change_config;
634675

635676
uint32_t data[MISC_DATA_MAX_SIZE_IN_DWORDS];
636677
};

drivers/gpu/drm/amd/include/mes_v12_api_def.h

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,10 @@ enum MESAPI_MISC_OPCODE {
643643
MESAPI_MISC__SET_SHADER_DEBUGGER,
644644
MESAPI_MISC__NOTIFY_WORK_ON_UNMAPPED_QUEUE,
645645
MESAPI_MISC__NOTIFY_TO_UNMAP_PROCESSES,
646+
MESAPI_MISC__QUERY_HUNG_ENGINE_ID,
647+
MESAPI_MISC__CHANGE_CONFIG,
648+
MESAPI_MISC__LAUNCH_CLEANER_SHADER,
649+
MESAPI_MISC__SETUP_MES_DBGEXT,
646650

647651
MESAPI_MISC__MAX,
648652
};
@@ -713,6 +717,31 @@ struct SET_GANG_SUBMIT {
713717
uint32_t slave_gang_context_array_index;
714718
};
715719

720+
enum MESAPI_MISC__CHANGE_CONFIG_OPTION {
721+
MESAPI_MISC__CHANGE_CONFIG_OPTION_LIMIT_SINGLE_PROCESS = 0,
722+
MESAPI_MISC__CHANGE_CONFIG_OPTION_ENABLE_HWS_LOGGING_BUFFER = 1,
723+
MESAPI_MISC__CHANGE_CONFIG_OPTION_CHANGE_TDR_CONFIG = 2,
724+
725+
MESAPI_MISC__CHANGE_CONFIG_OPTION_MAX = 0x1F
726+
};
727+
728+
struct CHANGE_CONFIG {
729+
enum MESAPI_MISC__CHANGE_CONFIG_OPTION opcode;
730+
union {
731+
struct {
732+
uint32_t limit_single_process : 1;
733+
uint32_t enable_hws_logging_buffer : 1;
734+
uint32_t reserved : 30;
735+
} bits;
736+
uint32_t all;
737+
} option;
738+
739+
struct {
740+
uint32_t tdr_level;
741+
uint32_t tdr_delay;
742+
} tdr_config;
743+
};
744+
716745
union MESAPI__MISC {
717746
struct {
718747
union MES_API_HEADER header;
@@ -726,7 +755,7 @@ union MESAPI__MISC {
726755
struct WAIT_REG_MEM wait_reg_mem;
727756
struct SET_SHADER_DEBUGGER set_shader_debugger;
728757
enum MES_AMD_PRIORITY_LEVEL queue_sch_level;
729-
758+
struct CHANGE_CONFIG change_config;
730759
uint32_t data[MISC_DATA_MAX_SIZE_IN_DWORDS];
731760
};
732761
uint64_t timestamp;

0 commit comments

Comments
 (0)