diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:23 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:38:36 +1000 |
commit | 9c38b4f8d3f0fa685da802bc511d89a35215c45f (patch) | |
tree | 9c1c8436c031cef4792cd8bfe00d7bac06f3ba39 /drm/nouveau/nouveau_abi16.c | |
parent | e7c0675537839f171106a865f33861a27c9c00d7 (diff) | |
download | nouveau-9c38b4f8d3f0fa685da802bc511d89a35215c45f.tar.gz |
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>
Diffstat (limited to 'drm/nouveau/nouveau_abi16.c')
-rw-r--r-- | drm/nouveau/nouveau_abi16.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/nouveau/nouveau_abi16.c b/drm/nouveau/nouveau_abi16.c index 4252e7796..d336c2247 100644 --- a/drm/nouveau/nouveau_abi16.c +++ b/drm/nouveau/nouveau_abi16.c @@ -498,7 +498,7 @@ nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARGS) args.start += chan->ntfy_vma.offset; args.limit += chan->ntfy_vma.offset; } else - if (drm->agp.stat == ENABLED) { + if (drm->agp.bridge) { args.target = NV_DMA_V0_TARGET_AGP; args.access = NV_DMA_V0_ACCESS_RDWR; args.start += drm->agp.base + chan->ntfy->bo.offset; |