From 586b9a4d7de9508ef714e5e913406376ba9c9623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Tue, 6 Mar 2018 14:56:00 +0100 Subject: [PATCH] drm/amd/pp: fix "Delete the wrapper layer of smu_allocate/free_memory" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Rex Zhu Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 2 +- 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};