← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/radeon/radeon_ttm.c
455
455
                        return -EINVAL;
456
456
                mem->bus.base = rdev->mc.aper_base;
457
457
                mem->bus.is_iomem = true;
 
458
#ifdef __alpha__
 
459
                /*
 
460
                 * Alpha: use bus.addr to hold the ioremap() return,
 
461
                 * so we can modify bus.base below.
 
462
                 */
 
463
                if (mem->placement & TTM_PL_FLAG_WC)
 
464
                        mem->bus.addr =
 
465
                                ioremap_wc(mem->bus.base + mem->bus.offset,
 
466
                                           mem->bus.size);
 
467
                else
 
468
                        mem->bus.addr =
 
469
                                ioremap_nocache(mem->bus.base + mem->bus.offset,
 
470
                                                mem->bus.size);
 
471
 
 
472
                /*
 
473
                 * Alpha: Use just the bus offset plus
 
474
                 * the hose/domain memory base for bus.base.
 
475
                 * It then can be used to build PTEs for VRAM
 
476
                 * access, as done in ttm_bo_vm_fault().
 
477
                 */
 
478
                mem->bus.base = (mem->bus.base & 0x0ffffffffUL) +
 
479
                        rdev->ddev->hose->dense_mem_base;
 
480
#endif
458
481
                break;
459
482
        default:
460
483
                return -EINVAL;