Attachment 77999 Details for Bug 57567 – temporary workaround v2

[patch] temporary workaround v2

0001-drm-radeon-disable-the-crtcs-in-mc_stop-evergreen-v2.patch (text/plain), 2.49 KB, created by Alex Deucher on 2013-04-15 14:52:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-04-15 14:52:16 UTC

Size: 2.49 KB

patch

obsolete

>From 34fb912aab3f319edf4201789bef2e24a53131e2 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Wed, 10 Apr 2013 19:08:14 -0400
>Subject: [PATCH] drm/radeon: disable the crtcs in mc_stop (evergreen+) (v2)
>
>Just disabling the mem requests should be enough, but
>that doesn't seem to work correctly on efi systems.
>
>May fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=57567
>https://bugs.freedesktop.org/show_bug.cgi?id=43655
>https://bugzilla.kernel.org/show_bug.cgi?id=56441
>
>v2: blank displays first, then disable.
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/evergreen.c |   12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
>index 42111e6..d425a4f 100644
>--- a/drivers/gpu/drm/radeon/evergreen.c
>+++ b/drivers/gpu/drm/radeon/evergreen.c
>@@ -1574,6 +1574,7 @@ void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *sav
> 				tmp = RREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i]);
> 				if (!(tmp & EVERGREEN_CRTC_BLANK_DATA_EN)) {
> 					radeon_wait_for_vblank(rdev, i);
>+					WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
> 					tmp |= EVERGREEN_CRTC_BLANK_DATA_EN;
> 					WREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i], tmp);
> 				}
>@@ -1581,8 +1582,10 @@ void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *sav
> 				tmp = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);
> 				if (!(tmp & EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE)) {
> 					radeon_wait_for_vblank(rdev, i);
>+					WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
> 					tmp |= EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE;
> 					WREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp);
>+					WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0);
> 				}
> 			}
> 			/* wait for the next frame */
>@@ -1592,6 +1595,15 @@ void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *sav
> 					break;
> 				udelay(1);
> 			}
>+
>+			/* XXX this is a hack to avoid strange behavior with EFI on certain systems */
>+			WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
>+			tmp = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);
>+			tmp &= ~EVERGREEN_CRTC_MASTER_EN;
>+			WREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp);
>+			WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0);
>+			save->crtc_enabled[i] = false;
>+			/* ***** */
> 		} else {
> 			save->crtc_enabled[i] = false;
> 		}
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 57567: 70606 | 70607 | 70608 | 70609 | 77383 | 77406 | 77407 | 77441 | 77602 | 77625 | 77705 | 77706 | 77743 | 77761 | 77808 | 77915 | 77999 | 78000 | 78081 | 78090

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.