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 'omap-for-v3.16/l3-noc-signed' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
core
/
engine
/
xtensa.c
diff --git
a/drivers/gpu/drm/nouveau/core/engine/xtensa.c
b/drivers/gpu/drm/nouveau/core/engine/xtensa.c
index 5f6ede7c48928a799e3a2084371e5bb86a2388d4..92384759d2f55aaa3205b191e7d57f5efe10754f 100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/engine/xtensa.c
+++ b/
drivers/gpu/drm/nouveau/core/engine/xtensa.c
@@
-112,7
+112,7
@@
_nouveau_xtensa_init(struct nouveau_object *object)
snprintf(name, sizeof(name), "nouveau/nv84_xuc%03x",
xtensa->addr >> 12);
snprintf(name, sizeof(name), "nouveau/nv84_xuc%03x",
xtensa->addr >> 12);
- ret = request_firmware(&fw, name,
&device->pdev->dev
);
+ ret = request_firmware(&fw, name,
nv_device_base(device)
);
if (ret) {
nv_warn(xtensa, "unable to load firmware %s\n", name);
return ret;
if (ret) {
nv_warn(xtensa, "unable to load firmware %s\n", name);
return ret;