Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nouveau_abi16.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index 40a903b79343e84dfa74218f2156dfa72666105f..d336c2247d6afa0759a9b3cfa686508eaead319a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -174,19 +174,19 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)
                getparam->value = device->info.chipset;
                break;
        case NOUVEAU_GETPARAM_PCI_VENDOR:
-               if (nv_device_is_pci(nvxx_device(device)))
+               if (nvxx_device(device)->func->pci)
                        getparam->value = dev->pdev->vendor;
                else
                        getparam->value = 0;
                break;
        case NOUVEAU_GETPARAM_PCI_DEVICE:
-               if (nv_device_is_pci(nvxx_device(device)))
+               if (nvxx_device(device)->func->pci)
                        getparam->value = dev->pdev->device;
                else
                        getparam->value = 0;
                break;
        case NOUVEAU_GETPARAM_BUS_TYPE:
-               if (!nv_device_is_pci(nvxx_device(device)))
+               if (!nvxx_device(device)->func->pci)
                        getparam->value = 3;
                else
                if (drm_pci_device_is_agp(dev))
@@ -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;