1 files changed, 15 insertions, 18 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_agp.c b/drivers/gpu/drm/nouveau/nouveau_agp.c
index 51666daddb94..1f6f6ba6847a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_agp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_agp.c
@@ -1,7 +1,5 @@
 #include <linux/module.h>
 
-#include <core/device.h>
-
 #include "nouveau_drm.h"
 #include "nouveau_agp.h"
 #include "nouveau_reg.h"
@@ -29,7 +27,7 @@ static struct nouveau_agpmode_quirk nouveau_agpmode_quirk_list[] = {
 static unsigned long
 get_agp_mode(struct nouveau_drm *drm, const struct drm_agp_info *info)
 {
-        struct nouveau_device *device = nv_device(drm->device);
+        struct nvif_device *device = &drm->device;
         struct nouveau_agpmode_quirk *quirk = nouveau_agpmode_quirk_list;
         int agpmode = nouveau_agpmode;
         unsigned long mode = info->mode;
@@ -38,7 +36,7 @@ get_agp_mode(struct nouveau_drm *drm, const struct drm_agp_info *info)
          * FW seems to be broken on nv18, it makes the card lock up
          * randomly.
          */
-        if (device->chipset == 0x18)
+        if (device->info.chipset == 0x18)
                 mode &= ~PCI_AGP_COMMAND_FW;
 
         /*
@@ -47,10 +45,10 @@ get_agp_mode(struct nouveau_drm *drm, const struct drm_agp_info *info)
         while (agpmode == -1 && quirk->hostbridge_vendor) {
                 if (info->id_vendor == quirk->hostbridge_vendor &&
                     info->id_device == quirk->hostbridge_device &&
-                    device->pdev->vendor == quirk->chip_vendor &&
-                    device->pdev->device == quirk->chip_device) {
+                    nvkm_device(device)->pdev->vendor == quirk->chip_vendor &&
+                    nvkm_device(device)->pdev->device == quirk->chip_device) {
                         agpmode = quirk->mode;
-                        nv_info(device, "Forcing agp mode to %dX. Use agpmode to override.\n",
+                        NV_INFO(drm, "Forcing agp mode to %dX. Use agpmode to override.\n",
                                 agpmode);
                         break;
                 }
@@ -104,7 +102,7 @@ void
 nouveau_agp_reset(struct nouveau_drm *drm)
 {
 #if __OS_HAS_AGP
-        struct nouveau_device *device = nv_device(drm->device);
+        struct nvif_device *device = &drm->device;
         struct drm_device *dev = drm->dev;
         u32 save[2];
         int ret;
@@ -115,7 +113,7 @@ nouveau_agp_reset(struct nouveau_drm *drm)
         /* First of all, disable fast writes, otherwise if it's
          * already enabled in the AGP bridge and we disable the card's
          * AGP controller we might be locking ourselves out of it. */
-        if ((nv_rd32(device, NV04_PBUS_PCI_NV_19) |
+        if ((nvif_rd32(device, NV04_PBUS_PCI_NV_19) |
              dev->agp->mode) & PCI_AGP_COMMAND_FW) {
                 struct drm_agp_info info;
                 struct drm_agp_mode mode;
@@ -134,15 +132,15 @@ nouveau_agp_reset(struct nouveau_drm *drm)
 
 
         /* clear busmaster bit, and disable AGP */
-        save[0] = nv_mask(device, NV04_PBUS_PCI_NV_1, 0x00000004, 0x00000000);
-        nv_wr32(device, NV04_PBUS_PCI_NV_19, 0);
+        save[0] = nvif_mask(device, NV04_PBUS_PCI_NV_1, 0x00000004, 0x00000000);
+        nvif_wr32(device, NV04_PBUS_PCI_NV_19, 0);
 
         /* reset PGRAPH, PFIFO and PTIMER */
-        save[1] = nv_mask(device, 0x000200, 0x00011100, 0x00000000);
-        nv_mask(device, 0x000200, 0x00011100, save[1]);
+        save[1] = nvif_mask(device, 0x000200, 0x00011100, 0x00000000);
+        nvif_mask(device, 0x000200, 0x00011100, save[1]);
 
         /* and restore bustmaster bit (gives effect of resetting AGP) */
-        nv_wr32(device, NV04_PBUS_PCI_NV_1, save[0]);
+        nvif_wr32(device, NV04_PBUS_PCI_NV_1, save[0]);
 #endif
 }
 
@@ -150,7 +148,6 @@ void
 nouveau_agp_init(struct nouveau_drm *drm)
 {
 #if __OS_HAS_AGP
-        struct nouveau_device *device = nv_device(drm->device);
         struct drm_device *dev = drm->dev;
         struct drm_agp_info info;
         struct drm_agp_mode mode;
@@ -162,13 +159,13 @@ nouveau_agp_init(struct nouveau_drm *drm)
 
         ret = drm_agp_acquire(dev);
         if (ret) {
-                nv_error(device, "unable to acquire AGP: %d\n", ret);
+                NV_ERROR(drm, "unable to acquire AGP: %d\n", ret);
                 return;
         }
 
         ret = drm_agp_info(dev, &info);
         if (ret) {
-                nv_error(device, "unable to get AGP info: %d\n", ret);
+                NV_ERROR(drm, "unable to get AGP info: %d\n", ret);
                 return;
         }
 
@@ -177,7 +174,7 @@ nouveau_agp_init(struct nouveau_drm *drm)
 
         ret = drm_agp_enable(dev, mode);
         if (ret) {
-                nv_error(device, "unable to enable AGP: %d\n", ret);
+                NV_ERROR(drm, "unable to enable AGP: %d\n", ret);
                 return;
         }