Merge branch 'address-masking'

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / amdgv_sriovmsg.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h b/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h
index 104a5ad..6e9eeae 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h
@@ -90,10 +90,12 @@ union amd_sriov_msg_feature_flags {
                uint32_t host_load_ucodes  : 1;
                uint32_t host_flr_vramlost : 1;
                uint32_t mm_bw_management  : 1;
-               uint32_t pp_one_vf_mode    : 1;
+               uint32_t pp_one_vf_mode    : 1;
                uint32_t reg_indirect_acc  : 1;
                uint32_t av1_support       : 1;
-               uint32_t reserved          : 25;
+               uint32_t vcn_rb_decouple   : 1;
+               uint32_t mes_info_enable   : 1;
+               uint32_t reserved          : 23;
        } flags;
        uint32_t all;
 };
@@ -156,7 +158,7 @@ struct amd_sriov_msg_pf2vf_info_header {
        uint32_t reserved[2];
 };
 
-#define AMD_SRIOV_MSG_PF2VF_INFO_FILLED_SIZE (48)
+#define AMD_SRIOV_MSG_PF2VF_INFO_FILLED_SIZE (49)
 struct amd_sriov_msg_pf2vf_info {
        /* header contains size and version */
        struct amd_sriov_msg_pf2vf_info_header header;
@@ -207,9 +209,11 @@ struct amd_sriov_msg_pf2vf_info {
        struct amd_sriov_msg_uuid_info uuid_info;
        /* PCIE atomic ops support flag */
        uint32_t pcie_atomic_ops_support_flags;
+       /* Portion of GPU memory occupied by VF.  MAX value is 65535, but set to uint32_t to maintain alignment with reserved size */
+       uint32_t gpu_capacity;
        /* reserved */
        uint32_t reserved[256 - AMD_SRIOV_MSG_PF2VF_INFO_FILLED_SIZE];
-};
+} __packed;
 
 struct amd_sriov_msg_vf2pf_info_header {
        /* the total structure size in byte */
@@ -220,7 +224,7 @@ struct amd_sriov_msg_vf2pf_info_header {
        uint32_t reserved[2];
 };
 
-#define AMD_SRIOV_MSG_VF2PF_INFO_FILLED_SIZE (70)
+#define AMD_SRIOV_MSG_VF2PF_INFO_FILLED_SIZE (73)
 struct amd_sriov_msg_vf2pf_info {
        /* header contains size and version */
        struct amd_sriov_msg_vf2pf_info_header header;
@@ -264,10 +268,12 @@ struct amd_sriov_msg_vf2pf_info {
                uint32_t version;
        } ucode_info[AMD_SRIOV_MSG_RESERVE_UCODE];
        uint64_t dummy_page_addr;
-
+       /* FB allocated for guest MES to record UQ info */
+       uint64_t mes_info_addr;
+       uint32_t mes_info_size;
        /* reserved */
        uint32_t reserved[256 - AMD_SRIOV_MSG_VF2PF_INFO_FILLED_SIZE];
-};
+} __packed;
 
 /* mailbox message send from guest to host  */
 enum amd_sriov_mailbox_request_message {