← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/radeon/radeon_cp.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/radeon/radeon_cp.c
244
244
        u32 agp_base_lo = agp_base & 0xffffffff;
245
245
        u32 r6xx_agp_base = (agp_base >> 22) & 0x3ffff;
246
246
 
247
 
        /* R6xx/R7xx must be aligned to a 4MB boundry */
 
247
        /* R6xx/R7xx must be aligned to a 4MB boundary */
248
248
        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV770)
249
249
                RADEON_WRITE(R700_MC_VM_AGP_BASE, r6xx_agp_base);
250
250
        else if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
2113
2113
                break;
2114
2114
        }
2115
2115
 
2116
 
        if (drm_device_is_agp(dev))
 
2116
        if (drm_pci_device_is_agp(dev))
2117
2117
                dev_priv->flags |= RADEON_IS_AGP;
2118
 
        else if (drm_device_is_pcie(dev))
 
2118
        else if (drm_pci_device_is_pcie(dev))
2119
2119
                dev_priv->flags |= RADEON_IS_PCIE;
2120
2120
        else
2121
2121
                dev_priv->flags |= RADEON_IS_PCI;