mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
Revert "drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()"
commit03c6284df1
upstream. This patch causes the following iounmap erorr and calltrace iounmap: bad address 00000000d0b3631f The original patch was unjustified because amdgpu_device_fini_sw() will always cleanup the rmmio mapping. This reverts commiteb4f139888
. Signed-off-by: Ma Jun <Jun.Ma2@amd.com> Suggested-by: Christian König <christian.koenig@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
91fb03cea0
commit
14ac934db8
1 changed files with 6 additions and 10 deletions
|
@ -3639,10 +3639,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,
|
||||||
* early on during init and before calling to RREG32.
|
* early on during init and before calling to RREG32.
|
||||||
*/
|
*/
|
||||||
adev->reset_domain = amdgpu_reset_create_reset_domain(SINGLE_DEVICE, "amdgpu-reset-dev");
|
adev->reset_domain = amdgpu_reset_create_reset_domain(SINGLE_DEVICE, "amdgpu-reset-dev");
|
||||||
if (!adev->reset_domain) {
|
if (!adev->reset_domain)
|
||||||
r = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto unmap_memory;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* detect hw virtualization here */
|
/* detect hw virtualization here */
|
||||||
amdgpu_detect_virtualization(adev);
|
amdgpu_detect_virtualization(adev);
|
||||||
|
@ -3652,20 +3650,20 @@ int amdgpu_device_init(struct amdgpu_device *adev,
|
||||||
r = amdgpu_device_get_job_timeout_settings(adev);
|
r = amdgpu_device_get_job_timeout_settings(adev);
|
||||||
if (r) {
|
if (r) {
|
||||||
dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n");
|
dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n");
|
||||||
goto unmap_memory;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* early init functions */
|
/* early init functions */
|
||||||
r = amdgpu_device_ip_early_init(adev);
|
r = amdgpu_device_ip_early_init(adev);
|
||||||
if (r)
|
if (r)
|
||||||
goto unmap_memory;
|
return r;
|
||||||
|
|
||||||
amdgpu_device_set_mcbp(adev);
|
amdgpu_device_set_mcbp(adev);
|
||||||
|
|
||||||
/* Get rid of things like offb */
|
/* Get rid of things like offb */
|
||||||
r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver);
|
r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver);
|
||||||
if (r)
|
if (r)
|
||||||
goto unmap_memory;
|
return r;
|
||||||
|
|
||||||
/* Enable TMZ based on IP_VERSION */
|
/* Enable TMZ based on IP_VERSION */
|
||||||
amdgpu_gmc_tmz_set(adev);
|
amdgpu_gmc_tmz_set(adev);
|
||||||
|
@ -3675,7 +3673,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
|
||||||
if (adev->gmc.xgmi.supported) {
|
if (adev->gmc.xgmi.supported) {
|
||||||
r = adev->gfxhub.funcs->get_xgmi_info(adev);
|
r = adev->gfxhub.funcs->get_xgmi_info(adev);
|
||||||
if (r)
|
if (r)
|
||||||
goto unmap_memory;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* enable PCIE atomic ops */
|
/* enable PCIE atomic ops */
|
||||||
|
@ -3932,8 +3930,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
|
||||||
failed:
|
failed:
|
||||||
amdgpu_vf_error_trans_all(adev);
|
amdgpu_vf_error_trans_all(adev);
|
||||||
|
|
||||||
unmap_memory:
|
|
||||||
iounmap(adev->rmmio);
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue