Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-09-25 14:43:31 +0200
committerJiri Kosina <jkosina@suse.cz>2018-09-25 14:43:31 +0200
commitcf4da1d5296dfa5cb94f3e9ea476120162aae152 (patch)
tree4be95494b6bdc92b8059f59d9f4b65777f2ad660
parent833c3554586321dbef589eb9c6c96d560b600280 (diff)
parent65518aadfd133c151aef7743919578f0150d4911 (diff)
Merge remote-tracking branch 'origin/users/tzimmermann/SLE15/for-next' into SLE15rpm-4.12.14-25.19
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index fbb908986615..d378ac2df0c9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -133,6 +133,11 @@ psp_cmd_submit_buf(struct psp_context *psp,
msleep(1);
}
+ if (ucode) {
+ ucode->tmr_mc_addr_lo = cmd_buf_mem->resp.fw_addr_lo;
+ ucode->tmr_mc_addr_hi = cmd_buf_mem->resp.fw_addr_hi;
+ }
+
amdgpu_bo_free_kernel(&cmd_buf_bo,
&cmd_buf_mc_addr,
(void **)&cmd_buf_mem);