Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (52 commits)
  drm/kms: Init the CRTC info fields for modes forced from the command line.
  drm/radeon/r600: CS parser updates
  drm/radeon/kms: add debugfs for power management for AtomBIOS devices
  drm/radeon/kms: initial mode validation support
  drm/radeon/kms/atom/dce3: call transmitter init on mode set
  drm/radeon/kms: store detailed connector info
  drm/radeon/kms/atom/dce3: fix up usPixelClock calculation for Transmitter tables
  drm/radeon/kms/r600: fix rs880 support v2
  drm/radeon/kms/r700: fix some typos in chip init
  drm/radeon/kms: remove some misleading debugging output
  drm/radeon/kms: stop putting VRAM at 0 in MC space on r600s.
  drm/radeon/kms: disable D1VGA and D2VGA if enabled
  drm/radeon/kms: Don't RMW CP_RB_CNTL
  drm/radeon/kms: fix coherency issues on AGP cards.
  drm/radeon/kms: fix rc410 suspend/resume.
  drm/radeon/kms: add quirk for hp dc5750
  drm/radeon/kms/atom: fix potential oops in spread spectrum code
  drm/kms: typo fix
  drm/radeon/kms/atom: Make card_info per device
  drm/radeon/kms/atom: Fix DVO support
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index a931af065dd4..a68d7566178c 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -140,15 +140,15 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset,
                 WARN(1, "trying to unbind memory to unitialized GART !\n");
                 return;
         }
-        t = offset / 4096;
-        p = t / (PAGE_SIZE / 4096);
+        t = offset / RADEON_GPU_PAGE_SIZE;
+        p = t / (PAGE_SIZE / RADEON_GPU_PAGE_SIZE);
         for (i = 0; i < pages; i++, p++) {
                 if (rdev->gart.pages[p]) {
                         pci_unmap_page(rdev->pdev, rdev->gart.pages_addr[p],
                                        PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
                         rdev->gart.pages[p] = NULL;
                         rdev->gart.pages_addr[p] = 0;
-                        for (j = 0; j < (PAGE_SIZE / 4096); j++, t++) {
+                        for (j = 0; j < (PAGE_SIZE / RADEON_GPU_PAGE_SIZE); j++, t++) {
                                 radeon_gart_set_page(rdev, t, 0);
                         }
                 }
@@ -169,8 +169,8 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
                 DRM_ERROR("trying to bind memory to unitialized GART !\n");
                 return -EINVAL;
         }
-        t = offset / 4096;
-        p = t / (PAGE_SIZE / 4096);
+        t = offset / RADEON_GPU_PAGE_SIZE;
+        p = t / (PAGE_SIZE / RADEON_GPU_PAGE_SIZE);
 
         for (i = 0; i < pages; i++, p++) {
                 /* we need to support large memory configurations */
@@ -185,9 +185,9 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
                 }
                 rdev->gart.pages[p] = pagelist[i];
                 page_base = rdev->gart.pages_addr[p];
-                for (j = 0; j < (PAGE_SIZE / 4096); j++, t++) {
+                for (j = 0; j < (PAGE_SIZE / RADEON_GPU_PAGE_SIZE); j++, t++) {
                         radeon_gart_set_page(rdev, t, page_base);
-                        page_base += 4096;
+                        page_base += RADEON_GPU_PAGE_SIZE;
                 }
         }
         mb();
@@ -200,14 +200,14 @@ int radeon_gart_init(struct radeon_device *rdev)
         if (rdev->gart.pages) {
                 return 0;
         }
-        /* We need PAGE_SIZE >= 4096 */
-        if (PAGE_SIZE < 4096) {
+        /* We need PAGE_SIZE >= RADEON_GPU_PAGE_SIZE */
+        if (PAGE_SIZE < RADEON_GPU_PAGE_SIZE) {
                 DRM_ERROR("Page size is smaller than GPU page size!\n");
                 return -EINVAL;
         }
         /* Compute table size */
         rdev->gart.num_cpu_pages = rdev->mc.gtt_size / PAGE_SIZE;
-        rdev->gart.num_gpu_pages = rdev->mc.gtt_size / 4096;
+        rdev->gart.num_gpu_pages = rdev->mc.gtt_size / RADEON_GPU_PAGE_SIZE;
         DRM_INFO("GART: num cpu pages %u, num gpu pages %u\n",
                  rdev->gart.num_cpu_pages, rdev->gart.num_gpu_pages);
         /* Allocate pages table */