2012-08-04 05:58:19

by Henrik Rydberg

Subject: [PATCH] nouveau: Do not use nva3 engine for 0xaf chipset

The nva3 copy engine exhibits random memory corruption in at least one
case, the GeForce 320M (nv50, 0xaf) in the MacBookAir3,1. This patch
omits creating the engine for the specific chipset, falling back to
M2MF, which kills the symptoms.

Signed-off-by: Henrik Rydberg <[email protected]>
---
Hi Ben,

this patch is still needed in 3.6-rc1, so perhaps we should apply it
after all. I have been running it without problems for a long time
now.

Thanks,
Henrik

drivers/gpu/drm/nouveau/nouveau_state.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 1cdfd6e..1866dbb 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -731,7 +731,6 @@ nouveau_card_init(struct drm_device *dev)
case 0xa3:
case 0xa5:
case 0xa8:
- case 0xaf:
nva3_copy_create(dev);
break;
}
--
1.7.11.4

2012-08-05 02:51:17

by Ben Skeggs

Subject: Re: [Nouveau] [PATCH] nouveau: Do not use nva3 engine for 0xaf chipset

On Sat, Aug 04, 2012 at 08:00:45AM +0200, Henrik Rydberg wrote:
> The nva3 copy engine exhibits random memory corruption in at least one
> case, the GeForce 320M (nv50, 0xaf) in the MacBookAir3,1. This patch
> omits creating the engine for the specific chipset, falling back to
> M2MF, which kills the symptoms.
I've pushed this (with slightly modified commit message) to nouveau git.

I'll get it to Linus' tree in a future -fixes merge.

Thanks,
Ben.

>
> Signed-off-by: Henrik Rydberg <[email protected]>
> ---
> Hi Ben,
>
> this patch is still needed in 3.6-rc1, so perhaps we should apply it
> after all. I have been running it without problems for a long time
> now.
>
> Thanks,
> Henrik
>
> drivers/gpu/drm/nouveau/nouveau_state.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
> index 1cdfd6e..1866dbb 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_state.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
> @@ -731,7 +731,6 @@ nouveau_card_init(struct drm_device *dev)
> case 0xa3:
> case 0xa5:
> case 0xa8:
> - case 0xaf:
> nva3_copy_create(dev);
> break;
> }
> --
> 1.7.11.4
>
> _______________________________________________
> Nouveau mailing list
> [email protected]
> http://lists.freedesktop.org/mailman/listinfo/nouveau