From: Greg Kroah-Hartman Date: Thu, 11 Apr 2024 09:30:40 +0000 (+0200) Subject: patch refresh X-Git-Tag: v4.19.312~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c152637d1475a2f6ad2d5bc98b9dc0fd3a835cf5;p=thirdparty%2Fkernel%2Fstable-queue.git patch refresh --- diff --git a/queue-6.8/revert-drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in-amdgpu_device_init.patch b/queue-6.8/revert-drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in-amdgpu_device_init.patch index 6bd98ce57ae..76380d99127 100644 --- a/queue-6.8/revert-drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in-amdgpu_device_init.patch +++ b/queue-6.8/revert-drm-amd-amdgpu-fix-potential-ioremap-memory-leaks-in-amdgpu_device_init.patch @@ -24,14 +24,12 @@ Reviewed-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 ++++++---------- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -index 1e9454e6e4cb..5dc24c971b41 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -4040,10 +4040,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, +@@ -4025,10 +4025,8 @@ int amdgpu_device_init(struct amdgpu_dev * early on during init and before calling to RREG32. */ adev->reset_domain = amdgpu_reset_create_reset_domain(SINGLE_DEVICE, "amdgpu-reset-dev"); @@ -44,7 +42,7 @@ index 1e9454e6e4cb..5dc24c971b41 100644 /* detect hw virtualization here */ amdgpu_detect_virtualization(adev); -@@ -4053,7 +4051,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, +@@ -4038,20 +4036,20 @@ int amdgpu_device_init(struct amdgpu_dev r = amdgpu_device_get_job_timeout_settings(adev); if (r) { dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n"); @@ -52,14 +50,14 @@ index 1e9454e6e4cb..5dc24c971b41 100644 + return r; } - amdgpu_device_set_mcbp(adev); -@@ -4061,12 +4059,12 @@ int amdgpu_device_init(struct amdgpu_device *adev, /* early init functions */ r = amdgpu_device_ip_early_init(adev); if (r) - goto unmap_memory; + return r; + amdgpu_device_set_mcbp(adev); + /* Get rid of things like offb */ r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver); if (r) @@ -68,7 +66,7 @@ index 1e9454e6e4cb..5dc24c971b41 100644 /* Enable TMZ based on IP_VERSION */ amdgpu_gmc_tmz_set(adev); -@@ -4076,7 +4074,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, +@@ -4061,7 +4059,7 @@ int amdgpu_device_init(struct amdgpu_dev if (adev->gmc.xgmi.supported) { r = adev->gfxhub.funcs->get_xgmi_info(adev); if (r) @@ -77,7 +75,7 @@ index 1e9454e6e4cb..5dc24c971b41 100644 } /* enable PCIE atomic ops */ -@@ -4345,8 +4343,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, +@@ -4330,8 +4328,6 @@ release_ras_con: failed: amdgpu_vf_error_trans_all(adev); @@ -86,6 +84,3 @@ index 1e9454e6e4cb..5dc24c971b41 100644 return r; } --- -2.44.0 -