diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2013-03-03 22:01:21 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-06-30 23:44:04 -0400 |
commit | dceef5d87cc01358cc1434416f3272e2ddc3d97a (patch) | |
tree | 6d073077600739f296087e0e38d65e21d7074873 /drivers/gpu/drm/nouveau/nva3_pm.c | |
parent | 54ecff3e1ad22fd44443acde7f27f213758fdddc (diff) |
drm/nouveau/fb: initialise vram controller as pfb sub-object
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nva3_pm.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nva3_pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c index 863f010fafeb..0d0ed597fea8 100644 --- a/drivers/gpu/drm/nouveau/nva3_pm.c +++ b/drivers/gpu/drm/nouveau/nva3_pm.c | |||
@@ -389,12 +389,12 @@ mclk_mrs(struct nouveau_mem_exec_func *exec, int mr, u32 data) | |||
389 | struct nouveau_device *device = nouveau_dev(exec->dev); | 389 | struct nouveau_device *device = nouveau_dev(exec->dev); |
390 | struct nouveau_fb *pfb = nouveau_fb(device); | 390 | struct nouveau_fb *pfb = nouveau_fb(device); |
391 | if (mr <= 1) { | 391 | if (mr <= 1) { |
392 | if (pfb->ram.ranks > 1) | 392 | if (pfb->ram->ranks > 1) |
393 | nv_wr32(device, 0x1002c8 + ((mr - 0) * 4), data); | 393 | nv_wr32(device, 0x1002c8 + ((mr - 0) * 4), data); |
394 | nv_wr32(device, 0x1002c0 + ((mr - 0) * 4), data); | 394 | nv_wr32(device, 0x1002c0 + ((mr - 0) * 4), data); |
395 | } else | 395 | } else |
396 | if (mr <= 3) { | 396 | if (mr <= 3) { |
397 | if (pfb->ram.ranks > 1) | 397 | if (pfb->ram->ranks > 1) |
398 | nv_wr32(device, 0x1002e8 + ((mr - 2) * 4), data); | 398 | nv_wr32(device, 0x1002e8 + ((mr - 2) * 4), data); |
399 | nv_wr32(device, 0x1002e0 + ((mr - 2) * 4), data); | 399 | nv_wr32(device, 0x1002e0 + ((mr - 2) * 4), data); |
400 | } | 400 | } |