340b0e7c500a0ac8fb649c58cf8528550642c1d8 - SHIFTPHONES/mainline/linux

commit	340b0e7c500a0ac8fb649c58cf8528550642c1d8	[log] [tgz]
author	Ben Skeggs <bskeggs@redhat.com>	Thu Aug 20 14:54:23 2015 +1000
committer	Ben Skeggs <bskeggs@redhat.com>	Fri Aug 28 12:40:49 2015 +1000
tree	5d0e79108aee9874fd4eabdb138cf7415ad770c0
parent	26c9e8effebb9166eb1cfba2d164676e98c505c7 [diff]

drm/nouveau/pci: merge agp handling from nouveau drm

This commit reinstates the pre-DEVINIT AGP fiddling that was broken in
an earlier commit.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

drivers/gpu/drm/nouveau/Kbuild[diff]
drivers/gpu/drm/nouveau/include/nvif/device.h[diff]
drivers/gpu/drm/nouveau/include/nvif/os.h[diff]
drivers/gpu/drm/nouveau/include/nvkm/core/option.h[diff]
drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h[diff]
drivers/gpu/drm/nouveau/nouveau_abi16.c[diff]
drivers/gpu/drm/nouveau/nouveau_agp.c[Deleted - diff]
drivers/gpu/drm/nouveau/nouveau_agp.h[Deleted - diff]
drivers/gpu/drm/nouveau/nouveau_bo.c[diff]
drivers/gpu/drm/nouveau/nouveau_chan.c[diff]
drivers/gpu/drm/nouveau/nouveau_drm.c[diff]
drivers/gpu/drm/nouveau/nouveau_drm.h[diff]
drivers/gpu/drm/nouveau/nouveau_ttm.c[diff]
drivers/gpu/drm/nouveau/nvkm/core/option.c[diff]
drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild[diff]
drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.c[Added - diff]
drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h[Added - diff]
drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c[diff]

18 files changed

tree: 5d0e79108aee9874fd4eabdb138cf7415ad770c0