diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:10:20 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:43:26 +1000 |
| commit | 2fd8b14c6f973ac2daa2ad6d81c9677a90dabe0e (patch) | |
| tree | 30dd434b5b48c7cd445825d35b11c85ffaad9c89 /drm/nouveau_drm.c | |
| parent | a4ca45b3092bc3b8a963d2ef98ec198c19494f6d (diff) | |
| download | nouveau-2fd8b14c6f973ac2daa2ad6d81c9677a90dabe0e.tar.gz | |
drm: store a pointer to vm in nouveau_cli
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau_drm.c')
| -rw-r--r-- | drm/nouveau_drm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drm/nouveau_drm.c b/drm/nouveau_drm.c index 64ec1d34b..fe99765d9 100644 --- a/drm/nouveau_drm.c +++ b/drm/nouveau_drm.c @@ -415,9 +415,11 @@ nouveau_drm_load(struct drm_device *dev, unsigned long flags) if (device->card_type >= NV_50) { ret = nouveau_vm_new(nv_device(drm->device), 0, (1ULL << 40), - 0x1000, &drm->client.base.vm); + 0x1000, &drm->client.vm); if (ret) goto fail_device; + + drm->client.base.vm = drm->client.vm; } ret = nouveau_ttm_init(drm); @@ -725,11 +727,13 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv) if (nv_device(drm->device)->card_type >= NV_50) { ret = nouveau_vm_new(nv_device(drm->device), 0, (1ULL << 40), - 0x1000, &cli->base.vm); + 0x1000, &cli->vm); if (ret) { nouveau_cli_destroy(cli); goto out_suspend; } + + cli->base.vm = cli->vm; } fpriv->driver_priv = cli; |