← 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/nouveau/nv50_pm.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/nouveau/nv50_pm.c
47
47
 
48
48
        reg0 = nv_rd32(dev, pll.reg + 0);
49
49
        reg1 = nv_rd32(dev, pll.reg + 4);
 
50
 
 
51
        if ((reg0 & 0x80000000) == 0) {
 
52
                if (id == PLL_SHADER) {
 
53
                        NV_DEBUG(dev, "Shader PLL is disabled. "
 
54
                                "Shader clock is twice the core\n");
 
55
                        ret = nv50_pm_clock_get(dev, PLL_CORE);
 
56
                        if (ret > 0)
 
57
                                return ret << 1;
 
58
                } else if (id == PLL_MEMORY) {
 
59
                        NV_DEBUG(dev, "Memory PLL is disabled. "
 
60
                                "Memory clock is equal to the ref_clk\n");
 
61
                        return pll.refclk;
 
62
                }
 
63
        }
 
64
 
50
65
        P = (reg0 & 0x00070000) >> 16;
51
66
        N = (reg1 & 0x0000ff00) >> 8;
52
67
        M = (reg1 & 0x000000ff);