drm/amdgpu: cleanup idh event/req for NV headers
Subsystems (2)
PATCH 1/7 drm/amdgpu: cleanup idh event/req for NV headers
1) drop the headers from AI in mxgpu_nv.c, should refer to mxgpu_nv.h
2) the IDH_EVENT_MAX is not used and not aligned with host side so drop it
3) the IDH_TEXT_MESSAG was provided in host but not defined in guest
--- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 3 ++- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 1 - drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 22 ++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 3 ++- 4 files changed, 26 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h +2 -1
@@ -46,7 +46,8 @@ enum idh_event {IDH_SUCCESS ,IDH_FAIL ,IDH_QUERY_ALIVE , - IDH_EVENT_MAX + + IDH_TEXT_MESSAGE = 255, };extern const struct amdgpu_virt_ops xgpu_ai_virt_ops;
drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c +0 -1
@@ -30,7 +30,6 @@#include "navi10_ih.h" #include "soc15_common.h" #include "mxgpu_nv.h" -#include "mxgpu_ai.h" static void xgpu_nv_mailbox_send_ack (struct amdgpu_device *adev) {
drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h +22 -0
@@ -28,6 +28,28 @@#define NV_MAILBOX_POLL_MSG_TIMEDOUT 12000#define NV_MAILBOX_POLL_FLR_TIMEDOUT 500 +enum idh_request { +IDH_REQ_GPU_INIT_ACCESS =1 , +IDH_REL_GPU_INIT_ACCESS , +IDH_REQ_GPU_FINI_ACCESS , +IDH_REL_GPU_FINI_ACCESS , +IDH_REQ_GPU_RESET_ACCESS , + +IDH_LOG_VF_ERROR =200 , +}; + +enum idh_event { +IDH_CLR_MSG_BUF =0 , +IDH_READY_TO_ACCESS_GPU , +IDH_FLR_NOTIFICATION , +IDH_FLR_NOTIFICATION_CMPL , +IDH_SUCCESS , +IDH_FAIL , +IDH_QUERY_ALIVE , + +IDH_TEXT_MESSAGE =255 , +}; +extern const struct amdgpu_virt_ops xgpu_nv_virt_ops;void xgpu_nv_mailbox_set_irq_funcs (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h +2 -1
@@ -43,7 +43,8 @@ enum idh_event {IDH_READY_TO_ACCESS_GPU ,IDH_FLR_NOTIFICATION ,IDH_FLR_NOTIFICATION_CMPL , - IDH_EVENT_MAX + + IDH_TEXT_MESSAGE = 255 };extern const struct amdgpu_virt_ops xgpu_vi_virt_ops;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/7 drm/amdgpu: introduce new idh_request/event enum
new idh_request and ihd_event to prepare for the
new handshake protocol implementation later
--- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h +2 -0
@@ -34,6 +34,7 @@ enum idh_request {IDH_REQ_GPU_FINI_ACCESS ,IDH_REL_GPU_FINI_ACCESS ,IDH_REQ_GPU_RESET_ACCESS , +IDH_REQ_GPU_INIT_DATA , IDH_LOG_VF_ERROR = 200, };
@@ -46,6 +47,7 @@ enum idh_event {IDH_SUCCESS ,IDH_FAIL ,IDH_QUERY_ALIVE , +IDH_REQ_GPU_INIT_DATA_READY , IDH_TEXT_MESSAGE = 255, };
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/7 drm/amdgpu: introduce new request and its function
In reply to Monk Liu1) modify xgpu_nv_send_access_requests to support
new idh request
2) introduce new function: req_gpu_init_data() which
is used to notify host to prepare vbios/ip-discovery/pfvf exchange
--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 13 +++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 3 ++ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 48 ++++++++++++++++++++++++++------ drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 2 +- 4 files changed, 57 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +13 -0
@@ -152,6 +152,19 @@ int amdgpu_virt_reset_gpu(struct amdgpu_device *adev)return 0 ; } +void amdgpu_virt_request_init_data (struct amdgpu_device *adev) +{ +struct amdgpu_virt *virt = &adev->virt; + +if (virt->ops && virt->ops->req_init_data) + virt->ops->req_init_data (adev); + +if (adev->virt.req_init_data_ver >0 ) +DRM_INFO ("host supports REQ_INIT_DATA handshake\n" ); +else +DRM_WARN ("host doesn't support REQ_INIT_DATA handshake\n" ); +} +/** * amdgpu_virt_wait_reset() - wait for reset gpu completed * @amdgpu: amdgpu device.
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +3 -0
@@ -59,6 +59,7 @@ struct amdgpu_vf_error_buffer {struct amdgpu_virt_ops {int (*req_full_gpu)(struct amdgpu_device *adev,bool init);int (*rel_full_gpu)(struct amdgpu_device *adev,bool init); +int (*req_init_data)(struct amdgpu_device *adev);int (*reset_gpu)(struct amdgpu_device *adev);int (*wait_reset)(struct amdgpu_device *adev);void (*trans_msg)(struct amdgpu_device *adev,u32 req,u32 data1,u32 data2,u32 data3);
@@ -263,6 +264,7 @@ struct amdgpu_virt {struct amdgpu_virt_fw_reserve fw_reserve;uint32_t gim_feature;uint32_t reg_access_mode; +int req_init_data_ver; };#define amdgpu_sriov_enabled (adev) \
@@ -303,6 +305,7 @@ void amdgpu_virt_kiq_reg_write_reg_wait(struct amdgpu_device *adev,int amdgpu_virt_request_full_gpu (struct amdgpu_device *adev,bool init);int amdgpu_virt_release_full_gpu (struct amdgpu_device *adev,bool init);int amdgpu_virt_reset_gpu (struct amdgpu_device *adev); +void amdgpu_virt_request_init_data (struct amdgpu_device *adev);int amdgpu_virt_wait_reset (struct amdgpu_device *adev);int amdgpu_virt_alloc_mm_table (struct amdgpu_device *adev);void amdgpu_virt_free_mm_table (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c +40 -8
77 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h +1 -1
@@ -25,7 +25,7 @@#define __MXGPU_NV_H__#define NV_MAILBOX_POLL_ACK_TIMEDOUT 500 -#define NV_MAILBOX_POLL_MSG_TIMEDOUT 12000 +#define NV_MAILBOX_POLL_MSG_TIMEDOUT 6000#define NV_MAILBOX_POLL_FLR_TIMEDOUT 500enum idh_request {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/7 drm/amdgpu: use static mmio offset for NV mailbox
In reply to Monk Liuwhat:
with the new "req_init_data" handshake we need to use mailbox before do IP discovery, so in mxgpu_nv.c file the original SOC15_REG method won'twork because that depends on IP discovery complete first.
how:
so the solution is to always use static MMIO offset for NV+ mailbox registers.
HW team confirm us all MAILBOX registers will be at the same offset for all ASICs, no IP discovery needed for those registers
--- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 52 +++++++++++++++-------------------- drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 18 ++++++++++-- 2 files changed, 38 insertions(+), 32 deletions(-)
drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c +22 -30
@@ -52,8 +52,7 @@ static void xgpu_nv_mailbox_set_valid(struct amdgpu_device *adev, bool val)*/ static enum idh_event xgpu_nv_mailbox_peek_msg (struct amdgpu_device *adev) { -return RREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , - mmBIF_BX_PF_MAILBOX_MSGBUF_RCV_DW0)); +return RREG32_NO_KIQ (mmMAILBOX_MSGBUF_RCV_DW0); }
@@ -62,8 +61,7 @@ static int xgpu_nv_mailbox_rcv_msg(struct amdgpu_device *adev, {u32 reg; - reg =RREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , - mmBIF_BX_PF_MAILBOX_MSGBUF_RCV_DW0)); + reg =RREG32_NO_KIQ (mmMAILBOX_MSGBUF_RCV_DW0);if (reg != event)return -ENOENT ;
@@ -116,7 +114,6 @@ static int xgpu_nv_poll_msg(struct amdgpu_device *adev, enum idh_event event)static void xgpu_nv_mailbox_trans_msg (struct amdgpu_device *adev,enum idh_request req,u32 data1,u32 data2,u32 data3) { -u32 reg;int r;uint8_t trn;
@@ -135,19 +132,10 @@ static void xgpu_nv_mailbox_trans_msg (struct amdgpu_device *adev, } }while (trn); - reg =RREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , - mmBIF_BX_PF_MAILBOX_MSGBUF_TRN_DW0)); - reg =REG_SET_FIELD (reg,BIF_BX_PF_MAILBOX_MSGBUF_TRN_DW0 , -MSGBUF_DATA , req); -WREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF_MAILBOX_MSGBUF_TRN_DW0), - reg); -WREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF_MAILBOX_MSGBUF_TRN_DW1), - data1); -WREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF_MAILBOX_MSGBUF_TRN_DW2), - data2); -WREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF_MAILBOX_MSGBUF_TRN_DW3), - data3); - +WREG32_NO_KIQ (mmMAILBOX_MSGBUF_TRN_DW0, req); +WREG32_NO_KIQ (mmMAILBOX_MSGBUF_TRN_DW1, data1); +WREG32_NO_KIQ (mmMAILBOX_MSGBUF_TRN_DW2, data2); +WREG32_NO_KIQ (mmMAILBOX_MSGBUF_TRN_DW3, data3);xgpu_nv_mailbox_set_valid (adev, true);/* start to poll ack */
@@ -192,8 +180,7 @@ static int xgpu_nv_send_access_requests(struct amdgpu_device *adev,if (req ==IDH_REQ_GPU_INIT_DATA ) { adev->virt.req_init_data_ver = -RREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , - mmBIF_BX_PF_MAILBOX_MSGBUF_RCV_DW1)); +RREG32_NO_KIQ (mmMAILBOX_MSGBUF_RCV_DW1);/* assume V1 in case host doesn't set version number */ if (adev->virt.req_init_data_ver <1 )
@@ -204,8 +191,7 @@ static int xgpu_nv_send_access_requests(struct amdgpu_device *adev,/* Retrieve checksum from mailbox2 */ if (req ==IDH_REQ_GPU_INIT_ACCESS || req ==IDH_REQ_GPU_RESET_ACCESS ) { adev->virt.fw_reserve.checksum_key = -RREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , - mmBIF_BX_PF_MAILBOX_MSGBUF_RCV_DW2)); +RREG32_NO_KIQ (mmMAILBOX_MSGBUF_RCV_DW2); } }
@@ -256,11 +242,14 @@ static int xgpu_nv_set_mailbox_ack_irq(struct amdgpu_device *adev,unsigned type, enum amdgpu_interrupt_state state) { - u32 tmp = RREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, mmBIF_BX_PF_MAILBOX_INT_CNTL)); + u32 tmp = RREG32_NO_KIQ(mmMAILBOX_INT_CNTL); - tmp =REG_SET_FIELD (tmp,BIF_BX_PF_MAILBOX_INT_CNTL ,ACK_INT_EN , - (state ==AMDGPU_IRQ_STATE_ENABLE ) ?1 :0 ); -WREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF_MAILBOX_INT_CNTL), tmp); +if (state ==AMDGPU_IRQ_STATE_ENABLE ) + tmp |=2 ; +else + tmp &= ~2 ; + +WREG32_NO_KIQ (mmMAILBOX_INT_CNTL, tmp);return 0 ; }
@@ -312,11 +301,14 @@ static int xgpu_nv_set_mailbox_rcv_irq(struct amdgpu_device *adev,unsigned type, enum amdgpu_interrupt_state state) { - u32 tmp = RREG32_NO_KIQ(SOC15_REG_OFFSET(NBIO, 0, mmBIF_BX_PF_MAILBOX_INT_CNTL)); + u32 tmp = RREG32_NO_KIQ(mmMAILBOX_INT_CNTL); + +if (state ==AMDGPU_IRQ_STATE_ENABLE ) + tmp |=1 ; +else + tmp &= ~1 ; - tmp =REG_SET_FIELD (tmp,BIF_BX_PF_MAILBOX_INT_CNTL ,VALID_INT_EN , - (state ==AMDGPU_IRQ_STATE_ENABLE ) ?1 :0 ); -WREG32_NO_KIQ (SOC15_REG_OFFSET (NBIO ,0 , mmBIF_BX_PF_MAILBOX_INT_CNTL), tmp); +WREG32_NO_KIQ (mmMAILBOX_INT_CNTL, tmp);return 0 ; }
drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h +16 -2
@@ -59,7 +59,21 @@ int xgpu_nv_mailbox_add_irq_id(struct amdgpu_device *adev);int xgpu_nv_mailbox_get_irq (struct amdgpu_device *adev);void xgpu_nv_mailbox_put_irq (struct amdgpu_device *adev); -#define NV_MAIBOX_CONTROL_TRN_OFFSET_BYTE (SOC15_REG_OFFSET(NBIO, 0, mmBIF_BX_PF_MAILBOX_CONTROL) * 4) -#define NV_MAIBOX_CONTROL_RCV_OFFSET_BYTE (SOC15_REG_OFFSET(NBIO, 0, mmBIF_BX_PF_MAILBOX_CONTROL) * 4 + 1) +#define mmMAILBOX_CONTROL 0xE5E + +#define NV_MAIBOX_CONTROL_TRN_OFFSET_BYTE (mmMAILBOX_CONTROL * 4) +#define NV_MAIBOX_CONTROL_RCV_OFFSET_BYTE (NV_MAIBOX_CONTROL_TRN_OFFSET_BYTE + 1) + +#define mmMAILBOX_MSGBUF_TRN_DW0 0xE56 +#define mmMAILBOX_MSGBUF_TRN_DW1 0xE57 +#define mmMAILBOX_MSGBUF_TRN_DW2 0xE58 +#define mmMAILBOX_MSGBUF_TRN_DW3 0xE59 + +#define mmMAILBOX_MSGBUF_RCV_DW0 0xE5A +#define mmMAILBOX_MSGBUF_RCV_DW1 0xE5B +#define mmMAILBOX_MSGBUF_RCV_DW2 0xE5C +#define mmMAILBOX_MSGBUF_RCV_DW3 0xE5D + +#define mmMAILBOX_INT_CNTL 0xE5F#endif
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/7 drm/amdgpu: equip new req_init_data handshake
In reply to Monk Liuby this new handshake host side can prepare vbios/ip-discovery and pf&vf exchange data upon recieving this request without stopping world switch.
this way the world switch is less impacted by VF's exclusive mode request
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 19 +++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/nv.c | 15 +++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +19 -0
@@ -1800,6 +1800,21 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)amdgpu_amdkfd_device_probe (adev);if (amdgpu_sriov_vf (adev)) { +/* handle vbios stuff prior full access mode for new handshake */ +if (adev->virt.req_init_data_ver ==1 ) { +if (!amdgpu_get_bios (adev)) { +DRM_ERROR ("failed to get vbios\n" ); +return -EINVAL ; + } + + r =amdgpu_atombios_init (adev); +if (r) { +dev_err (adev->dev,"amdgpu_atombios_init failed\n" ); +amdgpu_vf_error_put (adev,AMDGIM_ERROR_VF_ATOMBIOS_INIT_FAIL ,0 ,0 ); +return r; + } + } + r =amdgpu_virt_request_full_gpu (adev, true);if (r)return -EAGAIN ;
@@ -1832,6 +1847,10 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) }/* get the vbios after the asic_funcs are set up */ if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_COMMON ) { +/* skip vbios handling for new handshake */ +if (amdgpu_sriov_vf (adev) && adev->virt.req_init_data_ver ==1 ) +continue ; +/* Read BIOS */ if (!amdgpu_get_bios (adev))return -EINVAL ;
drivers/gpu/drm/amd/amdgpu/nv.c +9 -6
@@ -457,16 +457,19 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) {int r; -/* Set IP register base before any HW register access */ - r =nv_reg_base_init (adev); -if (r) -return r; - adev->nbio.funcs = &nbio_v2_3_funcs; adev->nbio.hdp_flush_reg = &nbio_v2_3_hdp_flush_reg; -if (amdgpu_sriov_vf (adev)) +if (amdgpu_sriov_vf (adev)) { adev->virt.ops = &xgpu_nv_virt_ops; +/* try send GPU_INIT_DATA request to host */ +amdgpu_virt_request_init_data (adev); + } + +/* Set IP register base before any HW register access */ + r =nv_reg_base_init (adev); +if (r) +return r;switch (adev->asic_type) {case CHIP_NAVI10 :
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/7 drm/amdgpu: adjust sequence of ip_discovery init and timeout_setting
In reply to Monk Liuwhat:
1)move timtout setting before ip_early_init to reduce exclusive mode cost for SRIOV
2)move ip_discovery_init() to inside of amdgpu_discovery_reg_base_init() it is a prepare for the later upcoming patches.
why:
in later upcoming patches we would use a new mailbox event -- "req_gpu_init_data", which is a callback hooked in adev->virt.ops and this callback send a new event "REQ_GPU_INIT_DAT" to host to notify host to do some preparation like "IP discovery/vbios on the VF FB" and this callback must be:
A) invoked after set_ip_block() because virt.ops is configured during set_ip_block()
B) invoked before ip_discovery_init() becausen ip_discovery_init() need host side prepares everything in VF FB first.
current place of ip_discovery_init() is before we can invoke callback of adev->virt.ops, thus we must move ip_discovery_init() to a place after the adev->virt.ops all settle done, and the perfect place is in amdgpu_discovery_reg_base_init()
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 ++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 ++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 1 - 3 files changed, 10 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -12
@@ -3079,12 +3079,10 @@ int amdgpu_device_init(struct amdgpu_device *adev,/* detect hw virtualization here */ amdgpu_detect_virtualization (adev); -if (amdgpu_discovery && adev->asic_type >=CHIP_NAVI10 ) { - r =amdgpu_discovery_init (adev); -if (r) { -dev_err (adev->dev,"amdgpu_discovery_init failed\n" ); -return r; - } + r =amdgpu_device_get_job_timeout_settings (adev); +if (r) { +dev_err (adev->dev,"invalid lockup_timeout parameter syntax\n" ); +return r; }/* early init functions */
@@ -3092,12 +3090,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (r)return r; - r =amdgpu_device_get_job_timeout_settings (adev); -if (r) { -dev_err (adev->dev,"invalid lockup_timeout parameter syntax\n" ); -return r; - } -/* doorbell bar mapping and doorbell index init*/ amdgpu_device_doorbell_init (adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +6 -4
@@ -156,7 +156,7 @@ static inline bool amdgpu_discovery_verify_checksum(uint8_t *data, uint32_t sizereturn !!(amdgpu_discovery_calculate_checksum (data, size) == expected); } -int amdgpu_discovery_init (struct amdgpu_device *adev) +static int amdgpu_discovery_init (struct amdgpu_device *adev) {struct table_info *info;struct binary_header *bhdr;
@@ -255,10 +255,12 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev)uint8_t num_base_address;int hw_ip;int i, j, k; +int r; -if (!adev->discovery) { -DRM_ERROR ("ip discovery uninitialized\n" ); -return -EINVAL ; + r =amdgpu_discovery_init (adev); +if (r) { +DRM_ERROR ("amdgpu_discovery_init failed\n" ); +return r; } bhdr = (struct binary_header *)adev->discovery;
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h +0 -1
@@ -26,7 +26,6 @@#define DISCOVERY_TMR_SIZE (64 << 10) -int amdgpu_discovery_init (struct amdgpu_device *adev);void amdgpu_discovery_fini (struct amdgpu_device *adev);int amdgpu_discovery_reg_base_init (struct amdgpu_device *adev); int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/7 drm/amdgpu: postpone entering fullaccess mode
In reply to Monk Liuif host support new handshake we only need to enter fullaccess_mode in ip_init() part, otherwise we need to do it before reading vbios (becuase host prepares vbios for VF only after received REQ_GPU_INIT event under legacy handshake)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +11 -1
@@ -1814,10 +1814,14 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)return r; } } + } +/* we need to send REQ_GPU here for legacy handshaker otherwise the vbios +* will not be prepared by host for this VF */ +if (amdgpu_sriov_vf (adev) && adev->virt.req_init_data_ver <1 ) { r =amdgpu_virt_request_full_gpu (adev, true);if (r) -return -EAGAIN ; +return r; } adev->pm.pp_feature = amdgpu_pp_feature_mask;
@@ -1977,6 +1981,12 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)if (r)return r; +if (amdgpu_sriov_vf (adev) && adev->virt.req_init_data_ver >0 ) { + r =amdgpu_virt_request_full_gpu (adev, true); +if (r) +return -EAGAIN ; + } +for (i =0 ; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 7/7] drm/amdgpu: postpone entering fullaccess mode
[AMD Official Use Only - Internal Distribution Only]
Series Reviewed-by: Emily Deng <[email protected]>
Quoted 55 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Monk Liu
Sent: Wednesday, March 25, 2020 11:59 AM
To: [email protected]
Cc: Liu, Monk <[email protected]>
Subject: [PATCH 7/7] drm/amdgpu: postpone entering fullaccess modeif host support new handshake we only need to enter
fullaccess_modeinip_init()part, otherwise we need to do it before reading vbios (becuase host prepares vbios for VF only after receivedREQ_GPU_INITevent under legacy handshake)Signed-off-by Monk Liu <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c| 12 +++++++++++-1 file changed, 11 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0@@ -1814,10 +1814,14 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)return r; } } + } +/* we need to send REQ_GPU here for legacy handshaker otherwise the vbios
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+* will not be prepared by host for this VF */ +if (amdgpu_sriov_vf (adev) && adev->virt.req_init_data_ver <1 ) {r = amdgpu_virt_request_full_gpu(adev, true); if (r)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1-return -EAGAIN ; +return r;} adev->pm.pp_feature = amdgpu_pp_feature_mask; @@ -1977,6 +1981,12 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) if (r) return r;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +6
-0+if (amdgpu_sriov_vf (adev) && adev->virt.req_init_data_ver >0 ) { + r =amdgpu_virt_request_full_gpu (adev, true); +if (r) +return -EAGAIN ; + } +for (i = 0; i < adev->num_ip_blocks; i++) { if (!adev->ip_blocks[i].status.valid) continue;--
2.7.4
Quoted 9 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.free
desktop.org%2Fmailman%2Flistinfo%2Famd- gfx&data=02%7C01%7CEmily.Deng%40amd.com%7C800016a97d6d499de adb08d7d070d87f%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C6 37207055405387207&sdata=J0nRbxV4lfqMe3XLszU7gIGpnookLgz9DaRJ4P WHRhg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx