diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0936-drm-amdgpu-Don-t-hang-in-amdgpu_flip_work_func-on-di.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0936-drm-amdgpu-Don-t-hang-in-amdgpu_flip_work_func-on-di.patch | 112 |
1 files changed, 0 insertions, 112 deletions
diff --git a/common/recipes-kernel/linux/files/0936-drm-amdgpu-Don-t-hang-in-amdgpu_flip_work_func-on-di.patch b/common/recipes-kernel/linux/files/0936-drm-amdgpu-Don-t-hang-in-amdgpu_flip_work_func-on-di.patch deleted file mode 100644 index 751f78d0..00000000 --- a/common/recipes-kernel/linux/files/0936-drm-amdgpu-Don-t-hang-in-amdgpu_flip_work_func-on-di.patch +++ /dev/null @@ -1,112 +0,0 @@ -From e5602933b9f018623616e1fd14e2649f50fa7783 Mon Sep 17 00:00:00 2001 -From: Mario Kleiner <mario.kleiner.de@gmail.com> -Date: Fri, 19 Feb 2016 02:06:39 +0100 -Subject: [PATCH 0936/1565] drm/amdgpu: Don't hang in amdgpu_flip_work_func on - disabled crtc. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes a regression introduced in Linux 4.4. - -This is a port of the same fix for radeon-kms in the -patch "drm/radeon: Don't hang in radeon_flip_work_func -on disabled crtc. (v2)" - -Limit the amount of time amdgpu_flip_work_func can -delay programming a page flip, by both limiting the -maximum amount of time per wait cycle and the maximum -number of wait cycles. Continue the flip if the limit -is exceeded, even if that may result in a visual or -timing glitch. - -This is to prevent a hang of page flips, as reported -in fdo bug #93746: Disconnecting a DisplayPort display -in parallel to a kms pageflip getting queued can cause -the following hang of page flips and thereby an unusable -desktop: - -1. kms pageflip ioctl() queues pageflip -> queues execution - of amdgpu_flip_work_func. - -2. Hotunplug of display causes the driver to DPMS OFF - the unplugged display. Display engine shuts down, - scanout no longer moves, but stays at its resting - position at start line of vblank. - -3. amdgpu_flip_work_func executes while crtc is off, and - due to the non-moving scanout position, the new flip - delay code introduced into Linux 4.4 by - commit 8e36f9d33c13 ("drm/amdgpu: Fixup hw vblank counter/ts..") - enters an infinite wait loop. - -4. After reconnecting the display, the pageflip continues - to hang in 3. and the display doesn't update its view - of the desktop. - -This patch fixes the Linux 4.4 regression from fdo bug #93746 - -<https://bugs.freedesktop.org/show_bug.cgi?id=93746> - -Reported-by: Bernd Steinhauser <linux@bernd-steinhauser.de> -Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> - -Cc: <stable@vger.kernel.org> # 4.4+ -Cc: Michel Dänzer <michel.daenzer@amd.com> -Cc: Alex Deucher <alexander.deucher@amd.com> -Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c -index 5580d34..0c713a9 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c -@@ -72,8 +72,8 @@ static void amdgpu_flip_work_func(struct work_struct *__work) - - struct drm_crtc *crtc = &amdgpuCrtc->base; - unsigned long flags; -- unsigned i; -- int vpos, hpos, stat, min_udelay; -+ unsigned i, repcnt = 4; -+ int vpos, hpos, stat, min_udelay = 0; - struct drm_vblank_crtc *vblank = &crtc->dev->vblank[work->crtc_id]; - - amdgpu_flip_wait_fence(adev, &work->excl); -@@ -96,7 +96,7 @@ static void amdgpu_flip_work_func(struct work_struct *__work) - * In practice this won't execute very often unless on very fast - * machines because the time window for this to happen is very small. - */ -- for (;;) { -+ while (amdgpuCrtc->enabled && repcnt--) { - /* GET_DISTANCE_TO_VBLANKSTART returns distance to real vblank - * start in hpos, and to the "fudged earlier" vblank start in - * vpos. -@@ -114,10 +114,22 @@ static void amdgpu_flip_work_func(struct work_struct *__work) - /* Sleep at least until estimated real start of hw vblank */ - spin_unlock_irqrestore(&crtc->dev->event_lock, flags); - min_udelay = (-hpos + 1) * max(vblank->linedur_ns / 1000, 5); -+ if (min_udelay > vblank->framedur_ns / 2000) { -+ /* Don't wait ridiculously long - something is wrong */ -+ repcnt = 0; -+ break; -+ } - usleep_range(min_udelay, 2 * min_udelay); - spin_lock_irqsave(&crtc->dev->event_lock, flags); - }; - -+ if (!repcnt) -+ DRM_DEBUG_DRIVER("Delay problem on crtc %d: min_udelay %d, " -+ "framedur %d, linedur %d, stat %d, vpos %d, " -+ "hpos %d\n", work->crtc_id, min_udelay, -+ vblank->framedur_ns / 1000, -+ vblank->linedur_ns / 1000, stat, vpos, hpos); -+ - /* do the flip (mmio) */ - adev->mode_info.funcs->page_flip(adev, work->crtc_id, work->base); - /* set the flip status */ --- -1.9.1 - |