diff options
| author | Christian König <christian.koenig@amd.com> | 2018-03-06 14:56:00 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-03-07 16:10:11 -0500 |
| commit | 586b9a4d7de9508ef714e5e913406376ba9c9623 (patch) | |
| tree | 2d8a0a68a0dc6e319fba8682bf9496062c63c93d | |
| parent | bb03c9c4a917ed602a6b9b01824dbfde5f6b9248 (diff) | |
| download | linux-586b9a4d7de9508ef714e5e913406376ba9c9623.tar.bz2 | |
drm/amd/pp: fix "Delete the wrapper layer of smu_allocate/free_memory"
For amdgpu_bo_create_kernel to work the handle must be NULL initialized,
otherwise we only try to pin and map the BO.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Rex Zhu <rezhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c index cf9ef7add56b..e2ee23ade5c5 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c @@ -327,10 +327,10 @@ static int rv_start_smu(struct pp_hwmgr *hwmgr) static int rv_smu_init(struct pp_hwmgr *hwmgr) { + struct amdgpu_bo *handle = NULL; struct rv_smumgr *priv; uint64_t mc_addr; void *kaddr = NULL; - struct amdgpu_bo *handle; int r; priv = kzalloc(sizeof(struct rv_smumgr), GFP_KERNEL); diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c index b7be91e7235b..15e1afa28018 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c @@ -377,11 +377,11 @@ static int vega10_verify_smc_interface(struct pp_hwmgr *hwmgr) static int vega10_smu_init(struct pp_hwmgr *hwmgr) { + struct amdgpu_bo *handle = NULL; struct vega10_smumgr *priv; uint64_t mc_addr; void *kaddr = NULL; unsigned long tools_size; - struct amdgpu_bo *handle; int ret; struct cgs_firmware_info info = {0}; |