diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2012-06-14 23:58:08 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-07-26 10:28:14 +1000 |
| commit | 887cd78804fb4179211d221c023455c33f13206a (patch) | |
| tree | d01996533a67687c9ff5b7f11c6562ace7d5603b /drivers/gpu | |
| parent | e0dd536a7abbce564eff9929e0a3cf77ba2d2e2e (diff) | |
| download | linux-3.10-887cd78804fb4179211d221c023455c33f13206a.tar.gz linux-3.10-887cd78804fb4179211d221c023455c33f13206a.tar.bz2 linux-3.10-887cd78804fb4179211d221c023455c33f13206a.zip | |
drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index d9cc2f2638d..437608d1dfe 100644 --- 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 }, |