projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pnp', 'pm-cpuidle' and 'pm-cpufreq'
[firefly-linux-kernel-4.4.55.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 8309c24ee6981f63e3dc5257235ce122e5840de5..8b3640f69e4fc5450411ac1a39bd8b2f9104cb59 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_chan.h
+++ b/
drivers/gpu/drm/nouveau/nouveau_chan.h
@@
-16,7
+16,7
@@
struct nouveau_channel {
struct {
struct nouveau_bo *buffer;
- struct n
ouveau
_vma vma;
+ struct n
vkm
_vma vma;
struct nvif_object ctxdma;
} push;