diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-08-17 09:26:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-08-17 09:26:13 +1000 |
| commit | 637319c67849baceea6ba466e62b70f9e674d85b (patch) | |
| tree | fa07dcd655978ecef23cb56fa1f8a0c1e0c09600 /drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | |
| parent | d32e2c6de78f7be0b6ddc0f5267d17fe0cb1bbc1 (diff) | |
| parent | c9533d1bca3393fbdfe5b24ccb4cfe6a1a02d794 (diff) | |
Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next
Fixes for 4.19:
- Add VCN PSP FW loading for RV (this is required on upcoming parts)
- Fix scheduler setup ordering for VCE and UVD
- Few misc display fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180816181840.2786-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 |
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 9f1a5bd39ae8..5b39d1399630 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -131,6 +131,11 @@ psp_cmd_submit_buf(struct psp_context *psp, msleep(1); } + if (ucode) { + ucode->tmr_mc_addr_lo = psp->cmd_buf_mem->resp.fw_addr_lo; + ucode->tmr_mc_addr_hi = psp->cmd_buf_mem->resp.fw_addr_hi; + } + return ret; } |