diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-13 17:21:22 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:12:51 +1000 |
| commit | 73a60c0d218a292f8ef29d3467726ff26ed366fc (patch) | |
| tree | 92e29ec2b7cbb3b501ac8a56d6f9e3f5bd2c957d /drivers/gpu/drm/nouveau/nouveau_drv.h | |
| parent | 18c9b959fd8ea6f3602efbedad788f53e305e6f1 (diff) | |
| download | linux-73a60c0d218a292f8ef29d3467726ff26ed366fc.tar.bz2 | |
drm/nouveau/gpuobj: remove flags for vm-mappings
Having GPUOBJ and VM intertwined like this makes it *really* hard to
continue porting to the new driver architecture, split it out in
favour of requiring explit maps be the caller.
It's more flexible and obvious this way anyway...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 8ec8ca6ef16f..0c03b472a9a0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -175,8 +175,6 @@ enum nouveau_flags { #define NVOBJ_FLAG_DONT_MAP (1 << 0) #define NVOBJ_FLAG_ZERO_ALLOC (1 << 1) #define NVOBJ_FLAG_ZERO_FREE (1 << 2) -#define NVOBJ_FLAG_VM (1 << 3) -#define NVOBJ_FLAG_VM_USER (1 << 4) #define NVOBJ_CINST_GLOBAL 0xdeadbeef @@ -194,7 +192,6 @@ struct nouveau_gpuobj { u32 pinst; /* PRAMIN BAR offset */ u32 cinst; /* Channel offset */ u64 vinst; /* VRAM address */ - u64 linst; /* VM address */ uint32_t engine; uint32_t class; |