Commit 8ce51fcf authored by Ben Skeggs's avatar Ben Skeggs

drm/nvc0/pm: minor clock readback fixes

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 59ef9742
...@@ -42,12 +42,16 @@ read_vco(struct drm_device *dev, u32 dsrc) ...@@ -42,12 +42,16 @@ read_vco(struct drm_device *dev, u32 dsrc)
static u32 static u32
read_pll(struct drm_device *dev, u32 pll) read_pll(struct drm_device *dev, u32 pll)
{ {
u32 ctrl = nv_rd32(dev, pll + 0);
u32 coef = nv_rd32(dev, pll + 4); u32 coef = nv_rd32(dev, pll + 4);
u32 P = (coef & 0x003f0000) >> 16; u32 P = (coef & 0x003f0000) >> 16;
u32 N = (coef & 0x0000ff00) >> 8; u32 N = (coef & 0x0000ff00) >> 8;
u32 M = (coef & 0x000000ff) >> 0; u32 M = (coef & 0x000000ff) >> 0;
u32 sclk, doff; u32 sclk, doff;
if (!(ctrl & 0x00000001))
return 0;
switch (pll & 0xfff000) { switch (pll & 0xfff000) {
case 0x00e000: case 0x00e000:
sclk = 27000; sclk = 27000;
...@@ -91,12 +95,12 @@ read_div(struct drm_device *dev, int doff, u32 dsrc, u32 dctl) ...@@ -91,12 +95,12 @@ read_div(struct drm_device *dev, int doff, u32 dsrc, u32 dctl)
return 100000; return 100000;
case 3: case 3:
if (sctl & 0x80000000) { if (sctl & 0x80000000) {
u32 sclk = read_vco(dev, dsrc); u32 sclk = read_vco(dev, dsrc + (doff * 4));
u32 sdiv = (sctl & 0x0000003f) + 2; u32 sdiv = (sctl & 0x0000003f) + 2;
return (sclk * 2) / sdiv; return (sclk * 2) / sdiv;
} }
return read_vco(dev, dsrc); return read_vco(dev, dsrc + (doff * 4));
default: default:
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment