diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-08-29 00:54:49 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-11-28 23:56:37 (GMT) |
| commit | f86770aaaa9a4d9cc68c8a9adc351ab7f47e6345 (patch) | |
| tree | 521b956c1c8dc3ee687edf52d9a8811a95f80c2c /drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h | |
| parent | 0a32241d8b58ab11d629b78adf81803bca918b69 (diff) | |
| download | linux-fsl-qoriq-f86770aaaa9a4d9cc68c8a9adc351ab7f47e6345.tar.xz | |
drm/nouveau/dmaobj: merge everything except ctor and bind together
Simplifies things a little, and currently no reason to need
chipset-specific dmaobj constructors.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h b/drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h index 700ccbb..f61d1a8 100644 --- a/drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h +++ b/drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h @@ -14,23 +14,6 @@ struct nouveau_dmaobj { u64 limit; }; -#define nouveau_dmaobj_create(p,e,c,a,s,d) \ - nouveau_dmaobj_create_((p), (e), (c), (a), (s), sizeof(**d), (void **)d) -#define nouveau_dmaobj_destroy(p) \ - nouveau_object_destroy(&(p)->base) -#define nouveau_dmaobj_init(p) \ - nouveau_object_init(&(p)->base) -#define nouveau_dmaobj_fini(p,s) \ - nouveau_object_fini(&(p)->base, (s)) - -int nouveau_dmaobj_create_(struct nouveau_object *, struct nouveau_object *, - struct nouveau_oclass *, void *data, u32 size, - int length, void **); - -#define _nouveau_dmaobj_dtor nouveau_object_destroy -#define _nouveau_dmaobj_init nouveau_object_init -#define _nouveau_dmaobj_fini nouveau_object_fini - struct nouveau_dmaeng { struct nouveau_engine base; int (*bind)(struct nouveau_dmaeng *, struct nouveau_object *parent, @@ -54,4 +37,6 @@ extern struct nouveau_oclass nv04_dmaeng_oclass; extern struct nouveau_oclass nv50_dmaeng_oclass; extern struct nouveau_oclass nvc0_dmaeng_oclass; +extern struct nouveau_oclass nouveau_dmaobj_sclass[]; + #endif |