drm/amd/amdgpu: add dummy_page_addr to sriov msg

Add dummy_page_addr to sriov msg for host driver to set
GCVM_L2_PROTECTION_DEFAULT_ADDR* registers correctly.

v2:
should update vf2pf msg instead

Signed-off-by: Jingwen Chen <[email protected]>
Reviewed-by: Horace Chen <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index 88c4177b708ac825819e55abd08ce521facca981..99c149397aae829b4031cee121146f823217607a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -584,6 +584,7 @@ static int amdgpu_virt_write_vf2pf_data(struct amdgpu_device *adev)
        vf2pf_info->encode_usage = 0;
        vf2pf_info->decode_usage = 0;
 
+       vf2pf_info->dummy_page_addr = (uint64_t)adev->dummy_page_addr;
        vf2pf_info->checksum =
                amd_sriov_msg_checksum(
                vf2pf_info, vf2pf_info->header.size, 0, 0);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h b/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h
index 995899191288d50bbd30c14e5d7d5e5859d78b98..7326b6c1b71c5ca4d1a0b0a2c532395548c75e51 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h
@@ -261,9 +261,10 @@ struct amd_sriov_msg_vf2pf_info {
                uint8_t  id;
                uint32_t version;
        } ucode_info[AMD_SRIOV_MSG_RESERVE_UCODE];
+       uint64_t dummy_page_addr;
 
        /* reserved */
-       uint32_t reserved[256-68];
+       uint32_t reserved[256-70];
 };
 
 /* mailbox message send from guest to host  */