1 files changed, 13 insertions, 11 deletions

diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
index 2d0c9ca484c5..f576232846c3 100644
--- a/drivers/gpu/drm/savage/savage_bci.c
+++ b/drivers/gpu/drm/savage/savage_bci.c
@@ -573,13 +573,13 @@ int savage_driver_firstopen(struct drm_device *dev)
         dev_priv->mtrr[2].handle = -1;
         if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
                 fb_rsrc = 0;
-                fb_base = drm_get_resource_start(dev, 0);
+                fb_base = pci_resource_start(dev->pdev, 0);
                 fb_size = SAVAGE_FB_SIZE_S3;
                 mmio_base = fb_base + SAVAGE_FB_SIZE_S3;
                 aper_rsrc = 0;
                 aperture_base = fb_base + SAVAGE_APERTURE_OFFSET;
                 /* this should always be true */
-                if (drm_get_resource_len(dev, 0) == 0x08000000) {
+                if (pci_resource_len(dev->pdev, 0) == 0x08000000) {
                         /* Don't make MMIO write-cobining! We need 3
                          * MTRRs. */
                         dev_priv->mtrr[0].base = fb_base;
@@ -599,18 +599,19 @@ int savage_driver_firstopen(struct drm_device *dev)
                                          dev_priv->mtrr[2].size, DRM_MTRR_WC);
                 } else {
                         DRM_ERROR("strange pci_resource_len %08llx\n",
-                                  (unsigned long long)drm_get_resource_len(dev, 0));
+                                  (unsigned long long)
+                                  pci_resource_len(dev->pdev, 0));
                 }
         } else if (dev_priv->chipset != S3_SUPERSAVAGE &&
                    dev_priv->chipset != S3_SAVAGE2000) {
-                mmio_base = drm_get_resource_start(dev, 0);
+                mmio_base = pci_resource_start(dev->pdev, 0);
                 fb_rsrc = 1;
-                fb_base = drm_get_resource_start(dev, 1);
+                fb_base = pci_resource_start(dev->pdev, 1);
                 fb_size = SAVAGE_FB_SIZE_S4;
                 aper_rsrc = 1;
                 aperture_base = fb_base + SAVAGE_APERTURE_OFFSET;
                 /* this should always be true */
-                if (drm_get_resource_len(dev, 1) == 0x08000000) {
+                if (pci_resource_len(dev->pdev, 1) == 0x08000000) {
                         /* Can use one MTRR to cover both fb and
                          * aperture. */
                         dev_priv->mtrr[0].base = fb_base;
@@ -620,15 +621,16 @@ int savage_driver_firstopen(struct drm_device *dev)
                                          dev_priv->mtrr[0].size, DRM_MTRR_WC);
                 } else {
                         DRM_ERROR("strange pci_resource_len %08llx\n",
-                                  (unsigned long long)drm_get_resource_len(dev, 1));
+                                  (unsigned long long)
+                                  pci_resource_len(dev->pdev, 1));
                 }
         } else {
-                mmio_base = drm_get_resource_start(dev, 0);
+                mmio_base = pci_resource_start(dev->pdev, 0);
                 fb_rsrc = 1;
-                fb_base = drm_get_resource_start(dev, 1);
-                fb_size = drm_get_resource_len(dev, 1);
+                fb_base = pci_resource_start(dev->pdev, 1);
+                fb_size = pci_resource_len(dev->pdev, 1);
                 aper_rsrc = 2;
-                aperture_base = drm_get_resource_start(dev, 2);
+                aperture_base = pci_resource_start(dev->pdev, 2);
                 /* Automatic MTRR setup will do the right thing. */
         }