OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bac34ed
)
drm/nouveau/fifo/gf100: remove references to "daemon"
author
Ben Skeggs
<bskeggs@redhat.com>
Mon, 4 Jan 2016 02:24:46 +0000
(12:24 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Mon, 11 Jan 2016 01:28:23 +0000
(11:28 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
index
6f276da
..
36a39c7
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
+++ b/
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
@@
-255,7
+255,7
@@
gf100_fifo_fault_engine[] = {
{ 0x14, "PMSPDEC", NULL, NVKM_ENGINE_MSPDEC },
{ 0x15, "PCE0", NULL, NVKM_ENGINE_CE0 },
{ 0x16, "PCE1", NULL, NVKM_ENGINE_CE1 },
- { 0x17, "P
DAEMON
" },
+ { 0x17, "P
MU
" },
{}
};
@@
-286,7
+286,7
@@
gf100_fifo_fault_hubclient[] = {
{ 0x0c, "PMSPPP" },
{ 0x0d, "PMSVLD" },
{ 0x11, "PCOUNTER" },
- { 0x12, "P
DAEMON
" },
+ { 0x12, "P
MU
" },
{ 0x14, "CCACHE" },
{ 0x15, "CCACHE_POST" },
{}