Attachment 66162 Details for Bug 53566 – restrict pce usage based on punits values

[patch] restrict pce usage based on punits values

0001-drm-nvc0-copy-check-PUNITS-to-determine-which-copy-e.patch (text/plain), 1.28 KB, created by Ben Skeggs on 2012-08-27 06:34:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Skeggs

Created: 2012-08-27 06:34:24 UTC

Size: 1.28 KB

patch

obsolete

>From fdacffdfc55fcaf16aa5a6c0ab9080da3cab67b0 Mon Sep 17 00:00:00 2001
>From: Ben Skeggs <bskeggs@redhat.com>
>Date: Mon, 27 Aug 2012 16:22:49 +1000
>Subject: [PATCH] drm/nvc0/copy: check PUNITS to determine which copy engines
> are disabled
>
>On some Fermi chipsets (NVCE particularly) PCOPY1 doesn't exist.  And if
>what I've seen on Kepler is true of Fermi too, chipsets of the same type
>can have different PCOPY units available.
>
>This should fix a v3.5 regression reported by a number of people effecting
>suspend/resume on NVCE chipsets.
>
>Cc: stable@vger.kernel.org
>Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
>---
> drivers/gpu/drm/nouveau/nouveau_state.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
>index 7b07a3d..c1ec3c4 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_state.c
>+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
>@@ -736,9 +736,11 @@ nouveau_card_init(struct drm_device *dev)
> 			}
> 			break;
> 		case NV_C0:
>-			nvc0_copy_create(dev, 1);
>+			if (!(nv_rd32(dev, 0x022500) & 0x00000200))
>+				nvc0_copy_create(dev, 1);
> 		case NV_D0:
>-			nvc0_copy_create(dev, 0);
>+			if (!(nv_rd32(dev, 0x022500) & 0x00000100))
>+				nvc0_copy_create(dev, 0);
> 			break;
> 		default:
> 			break;
>-- 
>1.7.12
>

Actions: View | Splinter Review

Attachments on bug 53566: 65623 | 66162 | 72200

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.