From: Marcin Slusarz Date: Thu, 14 Jun 2012 21:58:08 +0000 (+0200) Subject: drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION X-Git-Tag: MMI-PSA29.97-13-9~16260^2~1^2~5 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=887cd78804fb4179211d221c023455c33f13206a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index d9cc2f2638d6..437608d1dfe7 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 },