← 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/rs600.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/rs600.c
48
48
 
49
49
void rs600_pre_page_flip(struct radeon_device *rdev, int crtc)
50
50
{
51
 
        struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc];
52
 
        u32 tmp;
53
 
 
54
 
        /* make sure flip is at vb rather than hb */
55
 
        tmp = RREG32(AVIVO_D1GRPH_FLIP_CONTROL + radeon_crtc->crtc_offset);
56
 
        tmp &= ~AVIVO_D1GRPH_SURFACE_UPDATE_H_RETRACE_EN;
57
 
        WREG32(AVIVO_D1GRPH_FLIP_CONTROL + radeon_crtc->crtc_offset, tmp);
58
 
 
59
 
        /* set pageflip to happen anywhere in vblank interval */
60
 
        WREG32(AVIVO_D1MODE_MASTER_UPDATE_MODE + radeon_crtc->crtc_offset, 0);
61
 
 
62
51
        /* enable the pflip int */
63
52
        radeon_irq_kms_pflip_irq_get(rdev, crtc);
64
53
}
125
114
                                udelay(voltage->delay);
126
115
                }
127
116
        } else if (voltage->type == VOLTAGE_VDDC)
128
 
                radeon_atom_set_voltage(rdev, voltage->vddc_id);
 
117
                radeon_atom_set_voltage(rdev, voltage->vddc_id, SET_VOLTAGE_TYPE_ASIC_VDDC);
129
118
 
130
119
        dyn_pwrmgt_sclk_length = RREG32_PLL(DYN_PWRMGT_SCLK_LENGTH);
131
120
        dyn_pwrmgt_sclk_length &= ~REDUCED_POWER_SCLK_HILEN(0xf);
437
426
        return radeon_gart_table_vram_alloc(rdev);
438
427
}
439
428
 
440
 
int rs600_gart_enable(struct radeon_device *rdev)
 
429
static int rs600_gart_enable(struct radeon_device *rdev)
441
430
{
442
431
        u32 tmp;
443
432
        int r, i;
451
440
                return r;
452
441
        radeon_gart_restore(rdev);
453
442
        /* Enable bus master */
454
 
        tmp = RREG32(R_00004C_BUS_CNTL) & C_00004C_BUS_MASTER_DIS;
455
 
        WREG32(R_00004C_BUS_CNTL, tmp);
 
443
        tmp = RREG32(RADEON_BUS_CNTL) & ~RS600_BUS_MASTER_DIS;
 
444
        WREG32(RADEON_BUS_CNTL, tmp);
456
445
        /* FIXME: setup default page */
457
446
        WREG32_MC(R_000100_MC_PT0_CNTL,
458
447
                  (S_000100_EFFECTIVE_L2_CACHE_SIZE(6) |
865
854
        /* 1M ring buffer */
866
855
        r = r100_cp_init(rdev, 1024 * 1024);
867
856
        if (r) {
868
 
                dev_err(rdev->dev, "failled initializing CP (%d).\n", r);
 
857
                dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
869
858
                return r;
870
859
        }
871
860
        r = r100_ib_init(rdev);
872
861
        if (r) {
873
 
                dev_err(rdev->dev, "failled initializing IB (%d).\n", r);
 
862
                dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
874
863
                return r;
875
864
        }
876
865