diff options
| author | Ingo Molnar <[email protected]> | 2015-09-30 09:29:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2015-09-30 09:29:27 +0200 |
| commit | ccf79c238f1a06a801b4c4449b9bc8a42be2c7bc (patch) | |
| tree | e9b0f1a4c2f324c6fb107e276b09894ae480baa6 /drivers/gpu/drm/amd/amdgpu/cz_smc.c | |
| parent | 1e034743e918d195d339af340ae933727c072bce (diff) | |
| parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
Merge tag 'v4.3-rc3' into x86/urgent, before applying dependent fix
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cz_smc.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cz_smc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cz_smc.c b/drivers/gpu/drm/amd/amdgpu/cz_smc.c index a72ffc7d6c26..e33180d3314a 100644 --- a/drivers/gpu/drm/amd/amdgpu/cz_smc.c +++ b/drivers/gpu/drm/amd/amdgpu/cz_smc.c @@ -814,7 +814,8 @@ int cz_smu_init(struct amdgpu_device *adev) * 3. map kernel virtual address */ ret = amdgpu_bo_create(adev, priv->toc_buffer.data_size, PAGE_SIZE, - true, AMDGPU_GEM_DOMAIN_GTT, 0, NULL, toc_buf); + true, AMDGPU_GEM_DOMAIN_GTT, 0, NULL, NULL, + toc_buf); if (ret) { dev_err(adev->dev, "(%d) SMC TOC buffer allocation failed\n", ret); @@ -822,7 +823,8 @@ int cz_smu_init(struct amdgpu_device *adev) } ret = amdgpu_bo_create(adev, priv->smu_buffer.data_size, PAGE_SIZE, - true, AMDGPU_GEM_DOMAIN_GTT, 0, NULL, smu_buf); + true, AMDGPU_GEM_DOMAIN_GTT, 0, NULL, NULL, + smu_buf); if (ret) { dev_err(adev->dev, "(%d) SMC Internal buffer allocation failed\n", ret); |