aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv40_graph.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-10-19 19:47:06 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 15:06:52 +1000
commit50536946faaf3d9ac0245838eb09e5eb1065b06c (patch)
tree7daaa4cb7e2f9f26f4f9ac4ee37cfa9ab57f7777 /drivers/gpu/drm/nouveau/nv40_graph.c
parent9100468d1be26063aa25ecd667ea922c101d203f (diff)
downloadkernel_samsung_aries-50536946faaf3d9ac0245838eb09e5eb1065b06c.zip
kernel_samsung_aries-50536946faaf3d9ac0245838eb09e5eb1065b06c.tar.gz
kernel_samsung_aries-50536946faaf3d9ac0245838eb09e5eb1065b06c.tar.bz2
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/nv40_graph.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv40_graph.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
index 70d97cd..cd47760 100644
--- a/drivers/gpu/drm/nouveau/nv40_graph.c
+++ b/drivers/gpu/drm/nouveau/nv40_graph.c
@@ -409,23 +409,23 @@ void nv40_graph_takedown(struct drm_device *dev)
}
struct nouveau_pgraph_object_class nv40_graph_grclass[] = {
- { 0x0030, false, NULL }, /* null */
- { 0x0039, false, NULL }, /* m2mf */
- { 0x004a, false, NULL }, /* gdirect */
- { 0x009f, false, NULL }, /* imageblit (nv12) */
- { 0x008a, false, NULL }, /* ifc */
- { 0x0089, false, NULL }, /* sifm */
- { 0x3089, false, NULL }, /* sifm (nv40) */
- { 0x0062, false, NULL }, /* surf2d */
- { 0x3062, false, NULL }, /* surf2d (nv40) */
- { 0x0043, false, NULL }, /* rop */
- { 0x0012, false, NULL }, /* beta1 */
- { 0x0072, false, NULL }, /* beta4 */
- { 0x0019, false, NULL }, /* cliprect */
- { 0x0044, false, NULL }, /* pattern */
- { 0x309e, false, NULL }, /* swzsurf */
- { 0x4097, false, NULL }, /* curie (nv40) */
- { 0x4497, false, NULL }, /* curie (nv44) */
+ { 0x0030, NVOBJ_ENGINE_GR, NULL }, /* null */
+ { 0x0039, NVOBJ_ENGINE_GR, NULL }, /* m2mf */
+ { 0x004a, NVOBJ_ENGINE_GR, NULL }, /* gdirect */
+ { 0x009f, NVOBJ_ENGINE_GR, NULL }, /* imageblit (nv12) */
+ { 0x008a, NVOBJ_ENGINE_GR, NULL }, /* ifc */
+ { 0x0089, NVOBJ_ENGINE_GR, NULL }, /* sifm */
+ { 0x3089, NVOBJ_ENGINE_GR, NULL }, /* sifm (nv40) */
+ { 0x0062, NVOBJ_ENGINE_GR, NULL }, /* surf2d */
+ { 0x3062, NVOBJ_ENGINE_GR, NULL }, /* surf2d (nv40) */
+ { 0x0043, NVOBJ_ENGINE_GR, NULL }, /* rop */
+ { 0x0012, NVOBJ_ENGINE_GR, NULL }, /* beta1 */
+ { 0x0072, NVOBJ_ENGINE_GR, NULL }, /* beta4 */
+ { 0x0019, NVOBJ_ENGINE_GR, NULL }, /* cliprect */
+ { 0x0044, NVOBJ_ENGINE_GR, NULL }, /* pattern */
+ { 0x309e, NVOBJ_ENGINE_GR, NULL }, /* swzsurf */
+ { 0x4097, NVOBJ_ENGINE_GR, NULL }, /* curie (nv40) */
+ { 0x4497, NVOBJ_ENGINE_GR, NULL }, /* curie (nv44) */
{}
};