]> bbs.cooldavid.org Git - net-next-2.6.git/commit
drm/nouveau: Reset AGP before running the init scripts.
authorFrancisco Jerez <currojerez@riseup.net>
Fri, 23 Jul 2010 18:29:13 +0000 (20:29 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 26 Jul 2010 01:43:25 +0000 (11:43 +1000)
commite04d8e829d7807e132d8c82c3554b164a803c617
tree59a48dcafc2791869ec79b57616d2d83b71754f5
parent8bded189552800cae6c333475a54dabe048a74aa
drm/nouveau: Reset AGP before running the init scripts.

BIOS scripts usually make an attempt to reset the AGP controller,
however on some nv4x cards doing it properly involves switching FW off
and on: if we do that without updating the AGP bridge settings
accordingly (e.g. with the corresponding calls to agp_enable()) we
will be locking ourselves out of the card MMIO space. Do it from
nouveau_mem_reset_agp() before the init scripts are executed.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_drv.c
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_mem.c