1 files changed, 42 insertions, 42 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
index 1e2ad394233..5d8ab1b6b04 100644
--- a/drivers/gpu/drm/nouveau/nv04_graph.c
+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
@@ -1091,48 +1091,48 @@ static struct nouveau_pgraph_object_method nv04_graph_mthds_surf3d[] = {
 };
 struct nouveau_pgraph_object_class nv04_graph_grclass[] = {
-        { 0x0038, false, NULL }, /* dvd subpicture */
+        { 0x0038, NVOBJ_ENGINE_GR, NULL }, /* dvd subpicture */
-        { 0x0039, false, NULL }, /* m2mf */
+        { 0x0039, NVOBJ_ENGINE_GR, NULL }, /* m2mf */
-        { 0x004b, false, nv04_graph_mthds_nv03_gdirect }, /* nv03 gdirect */
+        { 0x004b, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv03_gdirect }, /* nv03 gdirect */
-        { 0x004a, false, nv04_graph_mthds_nv04_gdirect }, /* nv04 gdirect */
+        { 0x004a, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_gdirect }, /* nv04 gdirect */
-        { 0x001f, false, nv04_graph_mthds_nv01_imageblit }, /* nv01 imageblit */
+        { 0x001f, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv01_imageblit }, /* nv01 imageblit */
-        { 0x005f, false, nv04_graph_mthds_nv04_imageblit_ifc }, /* nv04 imageblit */
+        { 0x005f, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_imageblit_ifc }, /* nv04 imageblit */
-        { 0x0060, false, nv04_graph_mthds_nv04_iifc }, /* nv04 iifc */
+        { 0x0060, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_iifc }, /* nv04 iifc */
-        { 0x0064, false, NULL }, /* nv05 iifc */
+        { 0x0064, NVOBJ_ENGINE_GR, NULL }, /* nv05 iifc */
-        { 0x0021, false, nv04_graph_mthds_nv01_ifc }, /* nv01 ifc */
+        { 0x0021, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv01_ifc }, /* nv01 ifc */
-        { 0x0061, false, nv04_graph_mthds_nv04_imageblit_ifc }, /* nv04 ifc */
+        { 0x0061, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_imageblit_ifc }, /* nv04 ifc */
-        { 0x0065, false, NULL }, /* nv05 ifc */
+        { 0x0065, NVOBJ_ENGINE_GR, NULL }, /* nv05 ifc */
-        { 0x0036, false, nv04_graph_mthds_nv03_sifc }, /* nv03 sifc */
+        { 0x0036, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv03_sifc }, /* nv03 sifc */
-        { 0x0076, false, nv04_graph_mthds_nv04_sifc }, /* nv04 sifc */
+        { 0x0076, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_sifc }, /* nv04 sifc */
-        { 0x0066, false, NULL }, /* nv05 sifc */
+        { 0x0066, NVOBJ_ENGINE_GR, NULL }, /* nv05 sifc */
-        { 0x0037, false, nv04_graph_mthds_nv03_sifm }, /* nv03 sifm */
+        { 0x0037, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv03_sifm }, /* nv03 sifm */
-        { 0x0077, false, nv04_graph_mthds_nv04_sifm }, /* nv04 sifm */
+        { 0x0077, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_sifm }, /* nv04 sifm */
-        { 0x0030, false, NULL }, /* null */
+        { 0x0030, NVOBJ_ENGINE_GR, NULL }, /* null */
-        { 0x0042, false, NULL }, /* surf2d */
+        { 0x0042, NVOBJ_ENGINE_GR, NULL }, /* surf2d */
-        { 0x0043, false, NULL }, /* rop */
+        { 0x0043, NVOBJ_ENGINE_GR, NULL }, /* rop */
-        { 0x0012, false, NULL }, /* beta1 */
+        { 0x0012, NVOBJ_ENGINE_GR, NULL }, /* beta1 */
-        { 0x0072, false, NULL }, /* beta4 */
+        { 0x0072, NVOBJ_ENGINE_GR, NULL }, /* beta4 */
-        { 0x0019, false, NULL }, /* cliprect */
+        { 0x0019, NVOBJ_ENGINE_GR, NULL }, /* cliprect */
-        { 0x0018, false, NULL }, /* nv01 pattern */
+        { 0x0018, NVOBJ_ENGINE_GR, NULL }, /* nv01 pattern */
-        { 0x0044, false, NULL }, /* nv04 pattern */
+        { 0x0044, NVOBJ_ENGINE_GR, NULL }, /* nv04 pattern */
-        { 0x0052, false, NULL }, /* swzsurf */
+        { 0x0052, NVOBJ_ENGINE_GR, NULL }, /* swzsurf */
-        { 0x0053, false, nv04_graph_mthds_surf3d }, /* surf3d */
+        { 0x0053, NVOBJ_ENGINE_GR, nv04_graph_mthds_surf3d }, /* surf3d */
-        { 0x0048, false, nv04_graph_mthds_nv03_tex_tri }, /* nv03 tex_tri */
+        { 0x0048, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv03_tex_tri }, /* nv03 tex_tri */
-        { 0x0054, false, NULL }, /* tex_tri */
+        { 0x0054, NVOBJ_ENGINE_GR, NULL }, /* tex_tri */
-        { 0x0055, false, NULL }, /* multitex_tri */
+        { 0x0055, NVOBJ_ENGINE_GR, NULL }, /* multitex_tri */
-        { 0x0017, false, NULL }, /* nv01 chroma */
+        { 0x0017, NVOBJ_ENGINE_GR, NULL }, /* nv01 chroma */
-        { 0x0057, false, NULL }, /* nv04 chroma */
+        { 0x0057, NVOBJ_ENGINE_GR, NULL }, /* nv04 chroma */
-        { 0x0058, false, NULL }, /* surf_dst */
+        { 0x0058, NVOBJ_ENGINE_GR, NULL }, /* surf_dst */
-        { 0x0059, false, NULL }, /* surf_src */
+        { 0x0059, NVOBJ_ENGINE_GR, NULL }, /* surf_src */
-        { 0x005a, false, NULL }, /* surf_color */
+        { 0x005a, NVOBJ_ENGINE_GR, NULL }, /* surf_color */
-        { 0x005b, false, NULL }, /* surf_zeta */
+        { 0x005b, NVOBJ_ENGINE_GR, NULL }, /* surf_zeta */
-        { 0x001c, false, nv04_graph_mthds_nv01_shape }, /* nv01 line */
+        { 0x001c, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv01_shape }, /* nv01 line */
-        { 0x005c, false, nv04_graph_mthds_nv04_shape }, /* nv04 line */
+        { 0x005c, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_shape }, /* nv04 line */
-        { 0x001d, false, nv04_graph_mthds_nv01_shape }, /* nv01 tri */
+        { 0x001d, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv01_shape }, /* nv01 tri */
-        { 0x005d, false, nv04_graph_mthds_nv04_shape }, /* nv04 tri */
+        { 0x005d, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_shape }, /* nv04 tri */
-        { 0x001e, false, nv04_graph_mthds_nv01_shape }, /* nv01 rect */
+        { 0x001e, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv01_shape }, /* nv01 rect */
-        { 0x005e, false, nv04_graph_mthds_nv04_shape }, /* nv04 rect */
+        { 0x005e, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_shape }, /* nv04 rect */
-        { 0x506e, true, nv04_graph_mthds_sw },
+        { 0x506e, NVOBJ_ENGINE_SW, nv04_graph_mthds_sw },
        {}
 };

diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c index 1e2ad394233..5d8ab1b6b04 100644 --- a/drivers/gpu/drm/nouveau/nv04_graph.c +++ b/drivers/gpu/drm/nouveau/nv04_graph.c
@@ -1091,48 +1091,48 @@ static struct nouveau_pgraph_object_method nv04_graph_mthds_surf3d[] = {
1091	};	1091	};
1092		1092
1093	struct nouveau_pgraph_object_class nv04_graph_grclass[] = {	1093	struct nouveau_pgraph_object_class nv04_graph_grclass[] = {
1094	{ 0x0038, false, NULL }, /* dvd subpicture */	1094	{ 0x0038, NVOBJ_ENGINE_GR, NULL }, /* dvd subpicture */
1095	{ 0x0039, false, NULL }, /* m2mf */	1095	{ 0x0039, NVOBJ_ENGINE_GR, NULL }, /* m2mf */
1096	{ 0x004b, false, nv04_graph_mthds_nv03_gdirect }, /* nv03 gdirect */	1096	{ 0x004b, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv03_gdirect }, /* nv03 gdirect */
1097	{ 0x004a, false, nv04_graph_mthds_nv04_gdirect }, /* nv04 gdirect */	1097	{ 0x004a, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_gdirect }, /* nv04 gdirect */
1098	{ 0x001f, false, nv04_graph_mthds_nv01_imageblit }, /* nv01 imageblit */	1098	{ 0x001f, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv01_imageblit }, /* nv01 imageblit */
1099	{ 0x005f, false, nv04_graph_mthds_nv04_imageblit_ifc }, /* nv04 imageblit */	1099	{ 0x005f, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_imageblit_ifc }, /* nv04 imageblit */
1100	{ 0x0060, false, nv04_graph_mthds_nv04_iifc }, /* nv04 iifc */	1100	{ 0x0060, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_iifc }, /* nv04 iifc */
1101	{ 0x0064, false, NULL }, /* nv05 iifc */	1101	{ 0x0064, NVOBJ_ENGINE_GR, NULL }, /* nv05 iifc */
1102	{ 0x0021, false, nv04_graph_mthds_nv01_ifc }, /* nv01 ifc */	1102	{ 0x0021, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv01_ifc }, /* nv01 ifc */
1103	{ 0x0061, false, nv04_graph_mthds_nv04_imageblit_ifc }, /* nv04 ifc */	1103	{ 0x0061, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_imageblit_ifc }, /* nv04 ifc */
1104	{ 0x0065, false, NULL }, /* nv05 ifc */	1104	{ 0x0065, NVOBJ_ENGINE_GR, NULL }, /* nv05 ifc */
1105	{ 0x0036, false, nv04_graph_mthds_nv03_sifc }, /* nv03 sifc */	1105	{ 0x0036, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv03_sifc }, /* nv03 sifc */
1106	{ 0x0076, false, nv04_graph_mthds_nv04_sifc }, /* nv04 sifc */	1106	{ 0x0076, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_sifc }, /* nv04 sifc */
1107	{ 0x0066, false, NULL }, /* nv05 sifc */	1107	{ 0x0066, NVOBJ_ENGINE_GR, NULL }, /* nv05 sifc */
1108	{ 0x0037, false, nv04_graph_mthds_nv03_sifm }, /* nv03 sifm */	1108	{ 0x0037, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv03_sifm }, /* nv03 sifm */
1109	{ 0x0077, false, nv04_graph_mthds_nv04_sifm }, /* nv04 sifm */	1109	{ 0x0077, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_sifm }, /* nv04 sifm */
1110	{ 0x0030, false, NULL }, /* null */	1110	{ 0x0030, NVOBJ_ENGINE_GR, NULL }, /* null */
1111	{ 0x0042, false, NULL }, /* surf2d */	1111	{ 0x0042, NVOBJ_ENGINE_GR, NULL }, /* surf2d */
1112	{ 0x0043, false, NULL }, /* rop */	1112	{ 0x0043, NVOBJ_ENGINE_GR, NULL }, /* rop */
1113	{ 0x0012, false, NULL }, /* beta1 */	1113	{ 0x0012, NVOBJ_ENGINE_GR, NULL }, /* beta1 */
1114	{ 0x0072, false, NULL }, /* beta4 */	1114	{ 0x0072, NVOBJ_ENGINE_GR, NULL }, /* beta4 */
1115	{ 0x0019, false, NULL }, /* cliprect */	1115	{ 0x0019, NVOBJ_ENGINE_GR, NULL }, /* cliprect */
1116	{ 0x0018, false, NULL }, /* nv01 pattern */	1116	{ 0x0018, NVOBJ_ENGINE_GR, NULL }, /* nv01 pattern */
1117	{ 0x0044, false, NULL }, /* nv04 pattern */	1117	{ 0x0044, NVOBJ_ENGINE_GR, NULL }, /* nv04 pattern */
1118	{ 0x0052, false, NULL }, /* swzsurf */	1118	{ 0x0052, NVOBJ_ENGINE_GR, NULL }, /* swzsurf */
1119	{ 0x0053, false, nv04_graph_mthds_surf3d }, /* surf3d */	1119	{ 0x0053, NVOBJ_ENGINE_GR, nv04_graph_mthds_surf3d }, /* surf3d */
1120	{ 0x0048, false, nv04_graph_mthds_nv03_tex_tri }, /* nv03 tex_tri */	1120	{ 0x0048, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv03_tex_tri }, /* nv03 tex_tri */
1121	{ 0x0054, false, NULL }, /* tex_tri */	1121	{ 0x0054, NVOBJ_ENGINE_GR, NULL }, /* tex_tri */
1122	{ 0x0055, false, NULL }, /* multitex_tri */	1122	{ 0x0055, NVOBJ_ENGINE_GR, NULL }, /* multitex_tri */
1123	{ 0x0017, false, NULL }, /* nv01 chroma */	1123	{ 0x0017, NVOBJ_ENGINE_GR, NULL }, /* nv01 chroma */
1124	{ 0x0057, false, NULL }, /* nv04 chroma */	1124	{ 0x0057, NVOBJ_ENGINE_GR, NULL }, /* nv04 chroma */
1125	{ 0x0058, false, NULL }, /* surf_dst */	1125	{ 0x0058, NVOBJ_ENGINE_GR, NULL }, /* surf_dst */
1126	{ 0x0059, false, NULL }, /* surf_src */	1126	{ 0x0059, NVOBJ_ENGINE_GR, NULL }, /* surf_src */
1127	{ 0x005a, false, NULL }, /* surf_color */	1127	{ 0x005a, NVOBJ_ENGINE_GR, NULL }, /* surf_color */
1128	{ 0x005b, false, NULL }, /* surf_zeta */	1128	{ 0x005b, NVOBJ_ENGINE_GR, NULL }, /* surf_zeta */
1129	{ 0x001c, false, nv04_graph_mthds_nv01_shape }, /* nv01 line */	1129	{ 0x001c, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv01_shape }, /* nv01 line */
1130	{ 0x005c, false, nv04_graph_mthds_nv04_shape }, /* nv04 line */	1130	{ 0x005c, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_shape }, /* nv04 line */
1131	{ 0x001d, false, nv04_graph_mthds_nv01_shape }, /* nv01 tri */	1131	{ 0x001d, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv01_shape }, /* nv01 tri */
1132	{ 0x005d, false, nv04_graph_mthds_nv04_shape }, /* nv04 tri */	1132	{ 0x005d, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_shape }, /* nv04 tri */
1133	{ 0x001e, false, nv04_graph_mthds_nv01_shape }, /* nv01 rect */	1133	{ 0x001e, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv01_shape }, /* nv01 rect */
1134	{ 0x005e, false, nv04_graph_mthds_nv04_shape }, /* nv04 rect */	1134	{ 0x005e, NVOBJ_ENGINE_GR, nv04_graph_mthds_nv04_shape }, /* nv04 rect */
1135	{ 0x506e, true, nv04_graph_mthds_sw },	1135	{ 0x506e, NVOBJ_ENGINE_SW, nv04_graph_mthds_sw },
1136	{}	1136	{}
1137	};	1137	};
1138		1138