drm/amdgpu/mes11: update mes interface for acessing registers

Update MES firmware api for accessing registers.

Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/include/mes_v11_api_def.h b/drivers/gpu/drm/amd/include/mes_v11_api_def.h
index fa1b9e0d299a553302dd6e6560e9cdea286d72af..1d37ec2cd737752c24544c749aa44123f4bbf9f4 100644 (file)
--- a/drivers/gpu/drm/amd/include/mes_v11_api_def.h
+++ b/drivers/gpu/drm/amd/include/mes_v11_api_def.h
@@ -508,27 +508,40 @@ union MESAPI__SET_DEBUG_VMID {
 };
 
 enum MESAPI_MISC_OPCODE {
-       MESAPI_MISC__MODIFY_REG,
+       MESAPI_MISC__WRITE_REG,
        MESAPI_MISC__INV_GART,
        MESAPI_MISC__QUERY_STATUS,
+       MESAPI_MISC__READ_REG,
+       MESAPI_MISC__WAIT_REG_MEM,
        MESAPI_MISC__MAX,
 };
 
-enum MODIFY_REG_SUBCODE {
-       MODIFY_REG__OVERWRITE,
-       MODIFY_REG__RMW_OR,
-       MODIFY_REG__RMW_AND,
-       MODIFY_REG__MAX,
-};
-
 enum { MISC_DATA_MAX_SIZE_IN_DWORDS = 20 };
 
-struct MODIFY_REG {
-       enum MODIFY_REG_SUBCODE   subcode;
+struct WRITE_REG {
        uint32_t                  reg_offset;
        uint32_t                  reg_value;
 };
 
+struct READ_REG {
+       uint32_t                  reg_offset;
+       uint64_t                  buffer_addr;
+};
+
+enum WRM_OPERATION {
+       WRM_OPERATION__WAIT_REG_MEM,
+       WRM_OPERATION__WR_WAIT_WR_REG,
+       WRM_OPERATION__MAX,
+};
+
+struct WAIT_REG_MEM {
+       enum WRM_OPERATION         op;
+       uint32_t                   reference;
+       uint32_t                   mask;
+       uint32_t                   reg_offset1;
+       uint32_t                   reg_offset2;
+};
+
 struct INV_GART {
        uint64_t                  inv_range_va_start;
        uint64_t                  inv_range_size;
@@ -545,9 +558,11 @@ union MESAPI__MISC {
                struct MES_API_STATUS   api_status;
 
                union {
-                       struct          MODIFY_REG modify_reg;
+                       struct          WRITE_REG write_reg;
                        struct          INV_GART inv_gart;
                        struct          QUERY_STATUS query_status;
+                       struct          READ_REG read_reg;
+                       struct          WAIT_REG_MEM wait_reg_mem;
                        uint32_t        data[MISC_DATA_MAX_SIZE_IN_DWORDS];
                };
        };