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 tag 'arc-v3.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
core
/
engine
/
graph
/
nv20.c
diff --git
a/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
b/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
index 0607b9801748481e16d40ea2103d4855bb627f47..b24559315903f56b23dad5df1aa3cf95f9572882 100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
+++ b/
drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
@@
-254,7
+254,7
@@
nv20_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
if (ret)
return ret;
- ret = nouveau_gpuobj_new(
parent
, NULL, 32 * 4, 16,
+ ret = nouveau_gpuobj_new(
nv_object(priv)
, NULL, 32 * 4, 16,
NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab);
if (ret)
return ret;