← 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/rv770.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/rv770.c
105
105
        struct radeon_voltage *voltage = &ps->clock_info[req_cm_idx].voltage;
106
106
 
107
107
        if ((voltage->type == VOLTAGE_SW) && voltage->voltage) {
 
108
                /* 0xff01 is a flag rather then an actual voltage */
 
109
                if (voltage->voltage == 0xff01)
 
110
                        return;
108
111
                if (voltage->voltage != rdev->pm.current_vddc) {
109
 
                        radeon_atom_set_voltage(rdev, voltage->voltage);
 
112
                        radeon_atom_set_voltage(rdev, voltage->voltage, SET_VOLTAGE_TYPE_ASIC_VDDC);
110
113
                        rdev->pm.current_vddc = voltage->voltage;
111
114
                        DRM_DEBUG("Setting: v: %d\n", voltage->voltage);
112
115
                }
572
575
        else
573
576
                tcp_chan_steer = 0x00fac688;
574
577
 
 
578
        /* RV770 CE has special chremap setup */
 
579
        if (rdev->pdev->device == 0x944e) {
 
580
                tcp_chan_steer = 0x00b08b08;
 
581
                mc_shared_chremap = 0x00b08b08;
 
582
        }
 
583
 
575
584
        WREG32(TCP_CHAN_STEER, tcp_chan_steer);
576
585
        WREG32(MC_SHARED_CHREMAP, mc_shared_chremap);
577
586
}
1003
1012
        u64 gpu_addr;
1004
1013
 
1005
1014
        if (rdev->vram_scratch.robj == NULL) {
1006
 
                r = radeon_bo_create(rdev, NULL, RADEON_GPU_PAGE_SIZE,
 
1015
                r = radeon_bo_create(rdev, RADEON_GPU_PAGE_SIZE,
1007
1016
                                     PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,
1008
1017
                                     &rdev->vram_scratch.robj);
1009
1018
                if (r) {
1209
1218
 
1210
1219
        r = r600_ib_test(rdev);
1211
1220
        if (r) {
1212
 
                DRM_ERROR("radeon: failled testing IB (%d).\n", r);
 
1221
                DRM_ERROR("radeon: failed testing IB (%d).\n", r);
1213
1222
                return r;
1214
1223
        }
1215
1224
 
1255
1264
{
1256
1265
        int r;
1257
1266
 
1258
 
        r = radeon_dummy_page_init(rdev);
1259
 
        if (r)
1260
 
                return r;
1261
1267
        /* This don't do much */
1262
1268
        r = radeon_gem_init(rdev);
1263
1269
        if (r)
1362
1368
        r700_cp_fini(rdev);
1363
1369
        r600_irq_fini(rdev);
1364
1370
        radeon_wb_fini(rdev);
 
1371
        radeon_ib_pool_fini(rdev);
1365
1372
        radeon_irq_kms_fini(rdev);
1366
1373
        rv770_pcie_gart_fini(rdev);
1367
1374
        rv770_vram_scratch_fini(rdev);
1372
1379
        radeon_atombios_fini(rdev);
1373
1380
        kfree(rdev->bios);
1374
1381
        rdev->bios = NULL;
1375
 
        radeon_dummy_page_fini(rdev);
1376
1382
}
1377
1383
 
1378
1384
static void rv770_pcie_gen2_enable(struct radeon_device *rdev)