diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-10-19 05:47:06 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-03 00:06:52 -0500 |
commit | 50536946faaf3d9ac0245838eb09e5eb1065b06c (patch) | |
tree | 7daaa4cb7e2f9f26f4f9ac4ee37cfa9ab57f7777 /drivers/gpu/drm/nouveau/nouveau_drv.h | |
parent | 9100468d1be26063aa25ecd667ea922c101d203f (diff) |
drm/nouveau: store engine type in gpuobj class structs
We will eventually want to address hw engines other than PGRAPH.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 1d474f526986..2fdc26655ca1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -132,7 +132,7 @@ enum nouveau_flags { | |||
132 | 132 | ||
133 | #define NVOBJ_ENGINE_SW 0 | 133 | #define NVOBJ_ENGINE_SW 0 |
134 | #define NVOBJ_ENGINE_GR 1 | 134 | #define NVOBJ_ENGINE_GR 1 |
135 | #define NVOBJ_ENGINE_DISPLAY 2 | 135 | #define NVOBJ_ENGINE_DISPLAY 0xcafe0001 |
136 | #define NVOBJ_ENGINE_INT 0xdeadbeef | 136 | #define NVOBJ_ENGINE_INT 0xdeadbeef |
137 | 137 | ||
138 | #define NVOBJ_FLAG_ZERO_ALLOC (1 << 1) | 138 | #define NVOBJ_FLAG_ZERO_ALLOC (1 << 1) |
@@ -324,7 +324,7 @@ struct nouveau_pgraph_object_method { | |||
324 | 324 | ||
325 | struct nouveau_pgraph_object_class { | 325 | struct nouveau_pgraph_object_class { |
326 | int id; | 326 | int id; |
327 | bool software; | 327 | u32 engine; |
328 | struct nouveau_pgraph_object_method *methods; | 328 | struct nouveau_pgraph_object_method *methods; |
329 | }; | 329 | }; |
330 | 330 | ||