drm/nouveau/fb: merge fb/vram and port to subdev interfaces

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / nouveau / core / engine / fifo / nv40.c

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
index 3079f080d40ec71d505630714d170eebabd8230b..23ae4591b7bdcf8f4070663ec55d7caaab60f120 100644 (file)
--- 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;