projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f66c57d
)
drm/nouveau/fb/ram: use new interfaces for vmm operations
author
Ben Skeggs
<bskeggs@redhat.com>
Tue, 31 Oct 2017 17:56:19 +0000
(
03:56
+1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Thu, 2 Nov 2017 03:32:30 +0000
(13:32 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
index 03a860ae75b11be6f6c744a95447463f7c9662d8..5305078f730e731ee7b3af28644bf064ecbff06d 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
+++ b/
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
@@
-39,12
+39,22
@@
nvkm_vram_map(struct nvkm_memory *memory, u64 offset, struct nvkm_vmm *vmm,
struct nvkm_vma *vma, void *argv, u32 argc)
{
struct nvkm_vram *vram = nvkm_vram(memory);
- struct nvkm_mem mem = {
- .mem = vram->mn,
+ struct nvkm_vmm_map map = {
.memory = &vram->memory,
+ .offset = offset,
+ .mem = vram->mn,
};
- nvkm_vm_map_at(vma, offset, &mem);
- return 0;
+
+ if (vma->vm) {
+ struct nvkm_mem mem = {
+ .mem = vram->mn,
+ .memory = &vram->memory,
+ };
+ nvkm_vm_map_at(vma, offset, &mem);
+ return 0;
+ }
+
+ return nvkm_vmm_map(vmm, vma, argv, argc, &map);
}
static u64