Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amdgpu: disable CRTCs before teardown" failed to apply to 4.7-stable tree

PATCH [email protected] 1 participant 1 message Oct 4, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.7-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From a951ed85abd4615e98e36b536e3b3b07b22a88ac Mon Sep 17 00:00:00 2001

From: Grazvydas Ignotas <[email protected]>
Date: Sun, 25 Sep 2016 23:34:48 +0300
Subject: [PATCH] drm/amdgpu: disable CRTCs before teardown

Some code called by drm_crtc_force_disable_all() wants to wait for all fences, so only do fence teardown after CRTCs are disabled.

Fixes 84b89bdcedf8 ("drm/amdgpu: Turn off CRTCs on driver unload")
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
index df7ab2458e50..39c01b942ee4 100644
@@ -1708,11 +1708,11 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
 
 	DRM_INFO("amdgpu: finishing device.\n");
 	adev->shutdown = true;
+	drm_crtc_force_disable_all(adev->ddev);
 	/* evict vram memory */
 	amdgpu_bo_evict_vram(adev);
 	amdgpu_ib_pool_fini(adev);
 	amdgpu_fence_driver_fini(adev);
-	drm_crtc_force_disable_all(adev->ddev);
 	amdgpu_fbdev_fini(adev);
 	r = amdgpu_fini(adev);
 	kfree(adev->ip_block_status);