From 2f910ecd622e91347c04ae1e875409bffa0e4143 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Tue, 26 Feb 2013 02:33:11 +0100 Subject: [PATCH] --- yaml --- r: 360906 b: refs/heads/master c: 650e1203c11354ba84d69ba445abc0efcfe3890a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_agp.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c37b36a5526a..3b5dda34b6aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65b5f42e2a9eb9c8383fb67698bf8c27657f8c14 +refs/heads/master: 650e1203c11354ba84d69ba445abc0efcfe3890a diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_agp.c b/trunk/drivers/gpu/drm/nouveau/nouveau_agp.c index d28430cd2ba6..6e7a55f93a85 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_agp.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_agp.c @@ -47,6 +47,18 @@ nouveau_agp_enabled(struct nouveau_drm *drm) if (drm->agp.stat == UNKNOWN) { if (!nouveau_agpmode) return false; +#ifdef __powerpc__ + /* Disable AGP by default on all PowerPC machines for + * now -- At least some UniNorth-2 AGP bridges are + * known to be broken: DMA from the host to the card + * works just fine, but writeback from the card to the + * host goes straight to memory untranslated bypassing + * the GATT somehow, making them quite painful to deal + * with... + */ + if (nouveau_agpmode == -1) + return false; +#endif return true; }