diff options
author | 2019-03-05 15:24:43 +0100 | |
---|---|---|
committer | 2019-03-05 15:24:43 +0100 | |
commit | 2c2e5bb97544198a62e4edbf6aca5dd201979564 (patch) | |
tree | ffb927ea311d86aeee3a0ef561d6218280c038cb /drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | |
parent | HID: roccat: Mark expected switch fall-through (diff) | |
parent | HID: hid-asus: Add BT keyboard dock battery monitoring support (diff) | |
download | wireguard-linux-2c2e5bb97544198a62e4edbf6aca5dd201979564.tar.xz wireguard-linux-2c2e5bb97544198a62e4edbf6aca5dd201979564.zip |
Merge branch 'for-5.1/hid-asus' into for-linus
Asus Transbook T100CHI and T90CHI support from NOGUCHI Hiroshi
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c index 8cbb4655896a..b11a1c17a7f2 100644 --- a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c +++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c @@ -174,7 +174,7 @@ static int xgpu_ai_send_access_requests(struct amdgpu_device *adev, return r; } /* Retrieve checksum from mailbox2 */ - if (req == IDH_REQ_GPU_INIT_ACCESS) { + 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_PF0_MAILBOX_MSGBUF_RCV_DW2)); |