diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:20 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:43 +0300 |
| commit | c5fcafa528463b207108cd606e0d41741fb7dc50 (patch) | |
| tree | 0211a957a7d0db373d2e3b00df0e40d0b7a1388f /drivers/gpu/drm/nouveau/include | |
| parent | 03c8952fb36b58e451b8a93a1a2abd59e09ddf7b (diff) | |
| download | linux-c5fcafa528463b207108cd606e0d41741fb7dc50.tar.xz | |
drm/nouveau/fuse: convert to new-style nvkm_subdev
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h index 570a35356ff5..ae201e388487 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h @@ -1,33 +1,16 @@ #ifndef __NVKM_FUSE_H__ #define __NVKM_FUSE_H__ #include <core/subdev.h> -#include <core/device.h> struct nvkm_fuse { - struct nvkm_subdev subdev; const struct nvkm_fuse_func *func; + struct nvkm_subdev subdev; + spinlock_t lock; }; -struct nvkm_fuse_func { - u32 (*read)(struct nvkm_fuse *, u32 addr); -}; - -static inline struct nvkm_fuse * -nvkm_fuse(void *obj) -{ - return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_FUSE); -} - -#define nvkm_fuse_create(p, e, o, d) \ - nvkm_fuse_create_((p), (e), (o), sizeof(**d), (void **)d) - -int nvkm_fuse_create_(struct nvkm_object *, struct nvkm_object *, - struct nvkm_oclass *, int, void **); -void _nvkm_fuse_dtor(struct nvkm_object *); -int _nvkm_fuse_init(struct nvkm_object *); -#define _nvkm_fuse_fini _nvkm_subdev_fini +u32 nvkm_fuse_read(struct nvkm_fuse *, u32 addr); -extern struct nvkm_oclass nv50_fuse_oclass; -extern struct nvkm_oclass gf100_fuse_oclass; -extern struct nvkm_oclass gm107_fuse_oclass; +int nv50_fuse_new(struct nvkm_device *, int, struct nvkm_fuse **); +int gf100_fuse_new(struct nvkm_device *, int, struct nvkm_fuse **); +int gm107_fuse_new(struct nvkm_device *, int, struct nvkm_fuse **); #endif |