diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-11 19:05:01 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:12:49 +1000 |
| commit | 861d21074bbb141b0cc165a61c11f571571cda12 (patch) | |
| tree | fd5755cab318f77276044a40bcc274a6f8fe1ec1 /drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c | |
| parent | 0134a97979a0abc1c756b0fe491e074693c2bdf5 (diff) | |
| download | op-kernel-dev-861d21074bbb141b0cc165a61c11f571571cda12.zip op-kernel-dev-861d21074bbb141b0cc165a61c11f571571cda12.tar.gz | |
drm/nouveau/fb: merge fb/vram and port to subdev interfaces
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c index 3079f08..23ae459 100644 --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c @@ -163,7 +163,7 @@ nv40_fifo_init(struct drm_device *dev, int engine) break; default: nv_wr32(dev, 0x002230, 0x00000000); - nv_wr32(dev, 0x002220, ((dev_priv->vram_size - 512 * 1024 + + nv_wr32(dev, 0x002220, ((nvfb_vram_size(dev) - 512 * 1024 + dev_priv->ramfc->pinst) >> 16) | 0x00030000); break; |
