projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_chan.h
diff --git
a/drivers/gpu/drm/nouveau/nouveau_chan.h
b/drivers/gpu/drm/nouveau/nouveau_chan.h
index
9463a78
..
14607c1
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_chan.h
+++ b/
drivers/gpu/drm/nouveau/nouveau_chan.h
@@
-17,8
+17,9
@@
struct nouveau_channel {
struct {
struct nouveau_bo *buffer;
- struct n
vkm_vma
vma;
+ struct n
ouveau_vma *
vma;
struct nvif_object ctxdma;
+ u64 addr;
} push;
/* TODO: this will be reworked in the near future */