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:
e0dd536
)
drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
author
Marcin Slusarz
<marcin.slusarz@gmail.com>
Thu, 14 Jun 2012 21:58:08 +0000
(23:58 +0200)
committer
Ben Skeggs
<bskeggs@redhat.com>
Thu, 26 Jul 2012 00:28:14 +0000
(10:28 +1000)
Current name is misleading, because this error can be triggered by other
conditions, like changing STRMOUT parameter without disabling STRMOUT first.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_graph.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nv50_graph.c
b/drivers/gpu/drm/nouveau/nv50_graph.c
index
d9cc2f2
..
437608d
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/
drivers/gpu/drm/nouveau/nv50_graph.c
@@
-299,7
+299,7
@@
static struct nouveau_bitfield nv50_graph_trap_ccache[] = {
/* There must be a *lot* of these. Will take some time to gather them up. */
struct nouveau_enum nv50_data_error_names[] = {
- { 0x00000003, "INVALID_
QUERY_OR_TEXTURE
", NULL },
+ { 0x00000003, "INVALID_
OPERATION
", NULL },
{ 0x00000004, "INVALID_VALUE", NULL },
{ 0x00000005, "INVALID_ENUM", NULL },
{ 0x00000008, "INVALID_OBJECT", NULL },