diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-03-05 18:53:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-03-05 18:53:15 +1000 |
| commit | 64e38a8c8d6882e321eb7a9959321a85d16a05aa (patch) | |
| tree | 22566ba653d7300deb84ce15e5c879bdb9f7734f /drivers/gpu/drm/nouveau/nouveau_agp.c | |
| parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
| parent | 9f9bdaaf07dee47f73a160e6e4c64f67ee26c1d7 (diff) | |
| download | blackbird-op-linux-64e38a8c8d6882e321eb7a9959321a85d16a05aa.tar.gz blackbird-op-linux-64e38a8c8d6882e321eb7a9959321a85d16a05aa.zip | |
Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6
misc regression fixes from Ben.
* 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nv50-: prevent some races between modesetting and page flipping
drm/nouveau/i2c: drop parent refcount when creating ports
drm/nv84: fix regression in page flipping
drm/nouveau: Fix typo in init_idx_addr_latched().
drm/nouveau: Disable AGP on PowerPC again.
drm/nve0/graph: some random reg moved on kepler
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_agp.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_agp.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_agp.c b/drivers/gpu/drm/nouveau/nouveau_agp.c index d28430cd2ba6..6e7a55f93a85 100644 --- a/drivers/gpu/drm/nouveau/nouveau_agp.c +++ b/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; } |
