Skip to content

L
linux
Commit 68f3f702 authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nouveau/core: remove the remainder of the previous style 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7624fc01
Hide whitespace changes
Inline Side-by-side
Showing with 496 additions and 1856 deletions
drivers/gpu/drm/nouveau/include/nvif/device.h
View file @ 68f3f702
...@@ -48,7 +48,11 @@ u64 nvif_device_time(struct nvif_device *); ...@@ -48,7 +48,11 @@ u64 nvif_device_time(struct nvif_device *);
#define nvxx_device(a) ({ \ #define nvxx_device(a) ({ \
struct nvif_device *_device = (a); \ struct nvif_device *_device = (a); \
nv_device(_device->object.priv); \ struct { \
struct nvkm_object object; \
struct nvkm_device *device; \
} *_udevice = _device->object.priv; \
_udevice->device; \
}) })
#define nvxx_bios(a) nvxx_device(a)->bios #define nvxx_bios(a) nvxx_device(a)->bios
#define nvxx_fb(a) nvxx_device(a)->fb #define nvxx_fb(a) nvxx_device(a)->fb
......
drivers/gpu/drm/nouveau/include/nvkm/core/device.h
View file @ 68f3f702
#ifndef __NVKM_DEVICE_H__ #ifndef __NVKM_DEVICE_H__
#define __NVKM_DEVICE_H__ #define __NVKM_DEVICE_H__
#include <core/engine.h>
#include <core/event.h> #include <core/event.h>
#include <core/object.h>
enum nvkm_devidx { enum nvkm_devidx {
NVDEV_SUBDEV_VBIOS, NVKM_SUBDEV_VBIOS,
NVKM_SUBDEV_DEVINIT,
/* All subdevs from DEVINIT to DEVINIT_LAST will be created before NVKM_SUBDEV_IBUS,
* *any* of them are initialised. This subdev category is used NVKM_SUBDEV_GPIO,
* for any subdevs that the VBIOS init table parsing may call out NVKM_SUBDEV_I2C,
* to during POST. NVKM_SUBDEV_FUSE,
*/ NVKM_SUBDEV_MXM,
NVDEV_SUBDEV_DEVINIT, NVKM_SUBDEV_MC,
NVDEV_SUBDEV_IBUS, NVKM_SUBDEV_BUS,
NVDEV_SUBDEV_GPIO, NVKM_SUBDEV_TIMER,
NVDEV_SUBDEV_I2C, NVKM_SUBDEV_FB,
NVDEV_SUBDEV_DEVINIT_LAST = NVDEV_SUBDEV_I2C, NVKM_SUBDEV_LTC,
NVKM_SUBDEV_INSTMEM,
/* This grouping of subdevs are initialised right after they've NVKM_SUBDEV_MMU,
* been created, and are allowed to assume any subdevs in the NVKM_SUBDEV_BAR,
* list above them exist and have been initialised. NVKM_SUBDEV_PMU,
*/ NVKM_SUBDEV_VOLT,
NVDEV_SUBDEV_FUSE, NVKM_SUBDEV_THERM,
NVDEV_SUBDEV_MXM, NVKM_SUBDEV_CLK,
NVDEV_SUBDEV_MC,
NVDEV_SUBDEV_BUS, NVKM_ENGINE_DMAOBJ,
NVDEV_SUBDEV_TIMER, NVKM_ENGINE_IFB,
NVDEV_SUBDEV_FB, NVKM_ENGINE_FIFO,
NVDEV_SUBDEV_LTC, NVKM_ENGINE_SW,
NVDEV_SUBDEV_INSTMEM, NVKM_ENGINE_GR,
NVDEV_SUBDEV_MMU, NVKM_ENGINE_MPEG,
NVDEV_SUBDEV_BAR, NVKM_ENGINE_ME,
NVDEV_SUBDEV_PMU, NVKM_ENGINE_VP,
NVDEV_SUBDEV_VOLT, NVKM_ENGINE_CIPHER,
NVDEV_SUBDEV_THERM, NVKM_ENGINE_BSP,
NVDEV_SUBDEV_CLK, NVKM_ENGINE_MSPPP,
NVKM_ENGINE_CE0,
NVDEV_ENGINE_FIRST, NVKM_ENGINE_CE1,
NVDEV_ENGINE_DMAOBJ = NVDEV_ENGINE_FIRST, NVKM_ENGINE_CE2,
NVDEV_ENGINE_IFB, NVKM_ENGINE_VIC,
NVDEV_ENGINE_FIFO, NVKM_ENGINE_MSENC,
NVDEV_ENGINE_SW, NVKM_ENGINE_DISP,
NVDEV_ENGINE_GR, NVKM_ENGINE_PM,
NVDEV_ENGINE_MPEG, NVKM_ENGINE_MSVLD,
NVDEV_ENGINE_ME, NVKM_ENGINE_SEC,
NVDEV_ENGINE_VP, NVKM_ENGINE_MSPDEC,
NVDEV_ENGINE_CIPHER,
NVDEV_ENGINE_BSP, NVKM_SUBDEV_NR,
NVDEV_ENGINE_MSPPP,
NVDEV_ENGINE_CE0,
NVDEV_ENGINE_CE1,
NVDEV_ENGINE_CE2,
NVDEV_ENGINE_VIC,
NVDEV_ENGINE_MSENC,
NVDEV_ENGINE_DISP,
NVDEV_ENGINE_PM,
NVDEV_ENGINE_MSVLD,
NVDEV_ENGINE_SEC,
NVDEV_ENGINE_MSPDEC,
NVDEV_SUBDEV_NR,
}; };
struct nvkm_device { struct nvkm_device {
struct nvkm_engine engine;
const struct nvkm_device_func *func; const struct nvkm_device_func *func;
const struct nvkm_device_quirk *quirk; const struct nvkm_device_quirk *quirk;
struct device *dev; struct device *dev;
...@@ -85,6 +70,7 @@ struct nvkm_device { ...@@ -85,6 +70,7 @@ struct nvkm_device {
struct nvkm_event event; struct nvkm_event event;
u64 disable_mask; u64 disable_mask;
u32 debug;
const struct nvkm_device_chip *chip; const struct nvkm_device_chip *chip;
enum { enum {
...@@ -103,8 +89,6 @@ struct nvkm_device { ...@@ -103,8 +89,6 @@ struct nvkm_device {
u8 chiprev; u8 chiprev;
u32 crystal; u32 crystal;
struct nvkm_oclass *oclass[NVDEV_SUBDEV_NR];
struct { struct {
struct notifier_block nb; struct notifier_block nb;
} acpi; } acpi;
...@@ -227,8 +211,6 @@ int nvkm_device_list(u64 *name, int size); ...@@ -227,8 +211,6 @@ int nvkm_device_list(u64 *name, int size);
_temp; \ _temp; \
}) })
struct nvkm_device *nv_device(void *obj);
static inline bool static inline bool
nv_device_match(struct nvkm_device *device, u16 dev, u16 ven, u16 sub) nv_device_match(struct nvkm_device *device, u16 dev, u16 ven, u16 sub)
{ {
...@@ -285,7 +267,7 @@ extern const struct nvkm_sclass nvkm_udevice_sclass; ...@@ -285,7 +267,7 @@ extern const struct nvkm_sclass nvkm_udevice_sclass;
/* device logging */ /* device logging */
#define nvdev_printk_(d,l,p,f,a...) do { \ #define nvdev_printk_(d,l,p,f,a...) do { \
struct nvkm_device *_device = (d); \ struct nvkm_device *_device = (d); \
if (_device->engine.subdev.debug >= (l)) \ if (_device->debug >= (l)) \
dev_##p(_device->dev, f, ##a); \ dev_##p(_device->dev, f, ##a); \
} while(0) } while(0)
#define nvdev_printk(d,l,p,f,a...) nvdev_printk_((d), NV_DBG_##l, p, f, ##a) #define nvdev_printk(d,l,p,f,a...) nvdev_printk_((d), NV_DBG_##l, p, f, ##a)
......
drivers/gpu/drm/nouveau/include/nvkm/core/engine.h
View file @ 68f3f702
#ifndef __NVKM_ENGINE_H__ #ifndef __NVKM_ENGINE_H__
#define __NVKM_ENGINE_H__ #define __NVKM_ENGINE_H__
#define nvkm_engine(p) container_of((p), struct nvkm_engine, subdev)
#include <core/subdev.h> #include <core/subdev.h>
struct nvkm_device_oclass; /*XXX: DEV!ENG */
struct nvkm_fifo_chan; struct nvkm_fifo_chan;
struct nvkm_fb_tile; struct nvkm_fb_tile;
#define NV_ENGINE_(eng,var) (((var) << 8) | (eng))
#define NV_ENGINE(name,var) NV_ENGINE_(NVDEV_ENGINE_##name, (var))
struct nvkm_engine { struct nvkm_engine {
struct nvkm_subdev subdev;
const struct nvkm_engine_func *func; const struct nvkm_engine_func *func;
struct nvkm_subdev subdev;
spinlock_t lock;
int usecount; int usecount;
struct nvkm_oclass *cclass;
struct nvkm_oclass *sclass;
struct list_head contexts;
spinlock_t lock;
}; };
struct nvkm_engine_func { struct nvkm_engine_func {
...@@ -54,42 +46,4 @@ int nvkm_engine_new_(const struct nvkm_engine_func *, struct nvkm_device *, ...@@ -54,42 +46,4 @@ int nvkm_engine_new_(const struct nvkm_engine_func *, struct nvkm_device *,
struct nvkm_engine *nvkm_engine_ref(struct nvkm_engine *); struct nvkm_engine *nvkm_engine_ref(struct nvkm_engine *);
void nvkm_engine_unref(struct nvkm_engine **); void nvkm_engine_unref(struct nvkm_engine **);
void nvkm_engine_tile(struct nvkm_engine *, int region); void nvkm_engine_tile(struct nvkm_engine *, int region);
static inline struct nvkm_engine *
nv_engine(void *obj)
{
#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
BUG_ON(!nv_iclass(obj, NV_ENGINE_CLASS));
#endif
return obj;
}
static inline int
nv_engidx(struct nvkm_engine *engine)
{
return nv_subidx(&engine->subdev);
}
struct nvkm_engine *nvkm_engine(void *obj, int idx);
#define nvkm_engine_create(p,e,c,d,i,f,r) \
nvkm_engine_create_((p), (e), (c), (d), (i), (f), \
sizeof(**r),(void **)r)
#define nvkm_engine_destroy(p) \
nvkm_subdev_destroy(&(p)->subdev)
#define nvkm_engine_init_old(p) \
nvkm_subdev_init_old(&(p)->subdev)
#define nvkm_engine_fini_old(p,s) \
nvkm_subdev_fini_old(&(p)->subdev, (s))
int nvkm_engine_create_(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, bool, const char *,
const char *, int, void **);
#define _nvkm_engine_dtor _nvkm_subdev_dtor
#define _nvkm_engine_init _nvkm_subdev_init
#define _nvkm_engine_fini _nvkm_subdev_fini
#include <core/device.h>
#endif #endif
drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h
View file @ 68f3f702
...@@ -30,44 +30,11 @@ struct nvkm_gpuobj_func { ...@@ -30,44 +30,11 @@ struct nvkm_gpuobj_func {
void (*wr32)(struct nvkm_gpuobj *, u32 offset, u32 data); void (*wr32)(struct nvkm_gpuobj *, u32 offset, u32 data);
}; };
int nvkm_gpuobj_new(struct nvkm_device *, u32 size, int align, bool zero, int nvkm_gpuobj_new(struct nvkm_device *, u32 size, int align, bool zero,
struct nvkm_gpuobj *parent, struct nvkm_gpuobj **); struct nvkm_gpuobj *parent, struct nvkm_gpuobj **);
void nvkm_gpuobj_del(struct nvkm_gpuobj **); void nvkm_gpuobj_del(struct nvkm_gpuobj **);
static inline struct nvkm_gpuobj *
nv_gpuobj(void *obj)
{
#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
BUG_ON(!nv_iclass(obj, NV_GPUOBJ_CLASS));
#endif
return obj;
}
#define nvkm_gpuobj_create(p,e,c,v,g,s,a,f,d) \
nvkm_gpuobj_create_((p), (e), (c), (v), (g), (s), (a), (f), \
sizeof(**d), (void **)d)
#define nvkm_gpuobj_init(p) _nvkm_object_init(&(p)->object)
#define nvkm_gpuobj_fini(p,s) _nvkm_object_fini(&(p)->object, (s))
int nvkm_gpuobj_create_(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, u32 pclass,
struct nvkm_object *, u32 size, u32 align,
u32 flags, int length, void **);
void nvkm_gpuobj_destroy(struct nvkm_gpuobj *);
int nvkm_gpuobj_wrap(struct nvkm_memory *, struct nvkm_gpuobj **); int nvkm_gpuobj_wrap(struct nvkm_memory *, struct nvkm_gpuobj **);
int nvkm_gpuobj_map(struct nvkm_gpuobj *, struct nvkm_vm *, u32 access, int nvkm_gpuobj_map(struct nvkm_gpuobj *, struct nvkm_vm *, u32 access,
struct nvkm_vma *); struct nvkm_vma *);
void nvkm_gpuobj_unmap(struct nvkm_vma *); void nvkm_gpuobj_unmap(struct nvkm_vma *);
static inline void
nvkm_gpuobj_ref(struct nvkm_gpuobj *obj, struct nvkm_gpuobj **ref)
{
nvkm_object_ref(&obj->object, (struct nvkm_object **)ref);
}
void _nvkm_gpuobj_dtor(struct nvkm_object *);
int _nvkm_gpuobj_init(struct nvkm_object *);
int _nvkm_gpuobj_fini(struct nvkm_object *, bool);
u32 _nvkm_gpuobj_rd32(struct nvkm_object *, u64);
void _nvkm_gpuobj_wr32(struct nvkm_object *, u64, u32);
#endif #endif
drivers/gpu/drm/nouveau/include/nvkm/core/object.h
View file @ 68f3f702
...@@ -4,32 +4,18 @@ ...@@ -4,32 +4,18 @@
#include <core/debug.h> #include <core/debug.h>
struct nvkm_event; struct nvkm_event;
struct nvkm_gpuobj; struct nvkm_gpuobj;
struct nvkm_oclass;
#define NV_PARENT_CLASS 0x80000000
#define NV_NAMEDB_CLASS 0x40000000
#define NV_CLIENT_CLASS 0x20000000
#define NV_SUBDEV_CLASS 0x10000000
#define NV_ENGINE_CLASS 0x08000000
#define NV_MEMOBJ_CLASS 0x04000000
#define NV_GPUOBJ_CLASS 0x02000000
#define NV_ENGCTX_CLASS 0x01000000
struct nvkm_object { struct nvkm_object {
const struct nvkm_object_func *func; const struct nvkm_object_func *func;
struct nvkm_client *client; struct nvkm_client *client;
struct nvkm_engine *engine; struct nvkm_engine *engine;
u32 oclass_name; u32 oclass;
u32 handle; u32 handle;
struct nvkm_object *parent; struct nvkm_object *parent;
struct nvkm_oclass *oclass;
u32 pclass; u32 pclass;
atomic_t refcount; atomic_t refcount;
atomic_t usecount; atomic_t usecount;
#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
#define NVKM_OBJECT_MAGIC 0x75ef0bad
struct list_head list;
u32 _magic;
#endif
}; };
struct nvkm_object_func { struct nvkm_object_func {
...@@ -71,32 +57,6 @@ int nvkm_object_wr32(struct nvkm_object *, u64 addr, u32 data); ...@@ -71,32 +57,6 @@ int nvkm_object_wr32(struct nvkm_object *, u64 addr, u32 data);
int nvkm_object_bind(struct nvkm_object *, struct nvkm_gpuobj *, int align, int nvkm_object_bind(struct nvkm_object *, struct nvkm_gpuobj *, int align,
struct nvkm_gpuobj **); struct nvkm_gpuobj **);
static inline struct nvkm_object *
nv_object(void *obj)
{
#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
if (likely(obj)) {
struct nvkm_object *object = obj;
BUG_ON(object->_magic != NVKM_OBJECT_MAGIC);
}
#endif
return obj;
}
#define nvkm_object_create(p,e,c,s,d) \
nvkm_object_create_((p), (e), (c), (s), sizeof(**d), (void **)d)
int nvkm_object_create_(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, u32, int size, void **);
void nvkm_object_destroy(struct nvkm_object *);
int _nvkm_object_init(struct nvkm_object *);
int _nvkm_object_fini(struct nvkm_object *, bool suspend);
int _nvkm_object_ctor(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, void *, u32,
struct nvkm_object **);
extern struct nvkm_ofuncs nvkm_object_ofuncs;
struct nvkm_sclass { struct nvkm_sclass {
int minver; int minver;
int maxver; int maxver;
...@@ -107,60 +67,18 @@ struct nvkm_sclass { ...@@ -107,60 +67,18 @@ struct nvkm_sclass {
}; };
struct nvkm_oclass { struct nvkm_oclass {
s32 handle;
struct nvkm_ofuncs * const ofuncs;
int (*ctor)(const struct nvkm_oclass *, void *data, u32 size, int (*ctor)(const struct nvkm_oclass *, void *data, u32 size,
struct nvkm_object **); struct nvkm_object **);
struct nvkm_sclass base; struct nvkm_sclass base;
const void *priv; const void *priv;
const void *engn; const void *engn;
s32 handle;
u64 object; u64 object;
struct nvkm_client *client; struct nvkm_client *client;
struct nvkm_object *parent; struct nvkm_object *parent;
struct nvkm_engine *engine; struct nvkm_engine *engine;
}; };
#define nv_oclass(o) nv_object(o)->oclass
#define nv_hclass(o) nv_oclass(o)->handle
#define nv_iclass(o,i) (nv_object(o)->pclass & (i))
#define nv_mclass(o) nv_oclass(o)->handle
static inline struct nvkm_object *
nv_pclass(struct nvkm_object *parent, u32 oclass)
{
while (parent && !nv_iclass(parent, oclass))
parent = parent->parent;
return parent;
}
struct nvkm_ofuncs {
int (*ctor)(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, void *data, u32 size,
struct nvkm_object **);
void (*dtor)(struct nvkm_object *);
int (*init)(struct nvkm_object *);
int (*fini)(struct nvkm_object *, bool suspend);
int (*mthd)(struct nvkm_object *, u32, void *, u32);
int (*ntfy)(struct nvkm_object *, u32, struct nvkm_event **);
int (* map)(struct nvkm_object *, u64 *, u32 *);
u8 (*rd08)(struct nvkm_object *, u64 offset);
u16 (*rd16)(struct nvkm_object *, u64 offset);
u32 (*rd32)(struct nvkm_object *, u64 offset);
void (*wr08)(struct nvkm_object *, u64 offset, u8 data);
void (*wr16)(struct nvkm_object *, u64 offset, u16 data);
void (*wr32)(struct nvkm_object *, u64 offset, u32 data);
};
static inline struct nvkm_ofuncs *
nv_ofuncs(void *obj)
{
return nv_oclass(obj)->ofuncs;
}
int nvkm_object_old(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, void *, u32,
struct nvkm_object **);
void nvkm_object_ref(struct nvkm_object *, struct nvkm_object **); void nvkm_object_ref(struct nvkm_object *, struct nvkm_object **);
int nvkm_object_inc(struct nvkm_object *); int nvkm_object_inc(struct nvkm_object *);
int nvkm_object_dec(struct nvkm_object *, bool suspend); int nvkm_object_dec(struct nvkm_object *, bool suspend);
......
drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h
View file @ 68f3f702
#ifndef __NVKM_SUBDEV_H__ #ifndef __NVKM_SUBDEV_H__
#define __NVKM_SUBDEV_H__ #define __NVKM_SUBDEV_H__
#include <core/object.h> #include <core/device.h>
#define NV_SUBDEV_(sub,var) (((var) << 8) | (sub))
#define NV_SUBDEV(name,var) NV_SUBDEV_(NVDEV_SUBDEV_##name, (var))
struct nvkm_subdev { struct nvkm_subdev {
struct nvkm_object object;
const struct nvkm_subdev_func *func; const struct nvkm_subdev_func *func;
struct nvkm_device *device; struct nvkm_device *device;
int index; enum nvkm_devidx index;
u32 pmc_enable; u32 pmc_enable;
struct mutex mutex; struct mutex mutex;
u32 debug; u32 debug;
bool oneinit;
void (*intr)(struct nvkm_subdev *); bool oneinit;
u32 unit;
}; };
struct nvkm_subdev_func { struct nvkm_subdev_func {
...@@ -29,7 +22,7 @@ struct nvkm_subdev_func { ...@@ -29,7 +22,7 @@ struct nvkm_subdev_func {
void (*intr)(struct nvkm_subdev *); void (*intr)(struct nvkm_subdev *);
}; };
extern const char *nvkm_subdev_name[64]; extern const char *nvkm_subdev_name[NVKM_SUBDEV_NR];
void nvkm_subdev_ctor(const struct nvkm_subdev_func *, struct nvkm_device *, void nvkm_subdev_ctor(const struct nvkm_subdev_func *, struct nvkm_device *,
int index, u32 pmc_enable, struct nvkm_subdev *); int index, u32 pmc_enable, struct nvkm_subdev *);
void nvkm_subdev_del(struct nvkm_subdev **); void nvkm_subdev_del(struct nvkm_subdev **);
...@@ -38,40 +31,6 @@ int nvkm_subdev_init(struct nvkm_subdev *); ...@@ -38,40 +31,6 @@ int nvkm_subdev_init(struct nvkm_subdev *);
int nvkm_subdev_fini(struct nvkm_subdev *, bool suspend); int nvkm_subdev_fini(struct nvkm_subdev *, bool suspend);
void nvkm_subdev_intr(struct nvkm_subdev *); void nvkm_subdev_intr(struct nvkm_subdev *);
static inline struct nvkm_subdev *
nv_subdev(void *obj)
{
#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
BUG_ON(!nv_iclass(obj, NV_SUBDEV_CLASS));
#endif
return obj;
}
static inline int
nv_subidx(struct nvkm_subdev *subdev)
{
return nv_hclass(subdev) & 0xff;
}
struct nvkm_subdev *nvkm_subdev(void *obj, int idx);
#define nvkm_subdev_create(p,e,o,v,s,f,d) \
nvkm_subdev_create_((p), (e), (o), (v), (s), (f), \
sizeof(**d),(void **)d)
int nvkm_subdev_create_(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, u32 pclass,
const char *sname, const char *fname,
int size, void **);
void nvkm_subdev_destroy(struct nvkm_subdev *);
int nvkm_subdev_init_old(struct nvkm_subdev *);
int nvkm_subdev_fini_old(struct nvkm_subdev *, bool suspend);
void nvkm_subdev_reset(struct nvkm_object *);
void _nvkm_subdev_dtor(struct nvkm_object *);
int _nvkm_subdev_init(struct nvkm_object *);
int _nvkm_subdev_fini(struct nvkm_object *, bool suspend);
/* subdev logging */ /* subdev logging */
#define nvkm_printk_(s,l,p,f,a...) do { \ #define nvkm_printk_(s,l,p,f,a...) do { \
struct nvkm_subdev *_subdev = (s); \ struct nvkm_subdev *_subdev = (s); \
...@@ -88,6 +47,4 @@ int _nvkm_subdev_fini(struct nvkm_object *, bool suspend); ...@@ -88,6 +47,4 @@ int _nvkm_subdev_fini(struct nvkm_object *, bool suspend);
#define nvkm_debug(s,f,a...) nvkm_printk((s), DEBUG, info, f, ##a) #define nvkm_debug(s,f,a...) nvkm_printk((s), DEBUG, info, f, ##a)
#define nvkm_trace(s,f,a...) nvkm_printk((s), TRACE, info, f, ##a) #define nvkm_trace(s,f,a...) nvkm_printk((s), TRACE, info, f, ##a)
#define nvkm_spam(s,f,a...) nvkm_printk((s), SPAM, dbg, f, ##a) #define nvkm_spam(s,f,a...) nvkm_printk((s), SPAM, dbg, f, ##a)
#include <core/engine.h>
#endif #endif
drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
View file @ 68f3f702
...@@ -26,11 +26,9 @@ struct nvkm_fifo_chan { ...@@ -26,11 +26,9 @@ struct nvkm_fifo_chan {
u64 addr; u64 addr;
u32 size; u32 size;
struct nvkm_fifo_engn engn[NVDEV_SUBDEV_NR]; struct nvkm_fifo_engn engn[NVKM_SUBDEV_NR];
}; };
extern const struct nvkm_object_func nvkm_fifo_chan_func;
struct nvkm_fifo { struct nvkm_fifo {
const struct nvkm_fifo_func *func; const struct nvkm_fifo_func *func;
struct nvkm_engine engine; struct nvkm_engine engine;
......
drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
View file @ 68f3f702
...@@ -32,7 +32,7 @@ struct nvkm_vm { ...@@ -32,7 +32,7 @@ struct nvkm_vm {
struct kref refcount; struct kref refcount;
struct list_head pgd_list; struct list_head pgd_list;
atomic_t engref[NVDEV_SUBDEV_NR]; atomic_t engref[NVKM_SUBDEV_NR];
struct nvkm_vm_pgt *pgt; struct nvkm_vm_pgt *pgt;
u32 fpde; u32 fpde;
......
drivers/gpu/drm/nouveau/nvkm/core/engine.c
View file @ 68f3f702
...@@ -67,29 +67,26 @@ nvkm_engine_tile(struct nvkm_engine *engine, int region) ...@@ -67,29 +67,26 @@ nvkm_engine_tile(struct nvkm_engine *engine, int region)
} }
static void static void
nvkm_engine_intr(struct nvkm_subdev *obj) nvkm_engine_intr(struct nvkm_subdev *subdev)
{ {
struct nvkm_engine *engine = container_of(obj, typeof(*engine), subdev); struct nvkm_engine *engine = nvkm_engine(subdev);
if (engine->func->intr) if (engine->func->intr)
engine->func->intr(engine); engine->func->intr(engine);
} }
static int static int
nvkm_engine_fini(struct nvkm_subdev *obj, bool suspend) nvkm_engine_fini(struct nvkm_subdev *subdev, bool suspend)
{ {
struct nvkm_engine *engine = container_of(obj, typeof(*engine), subdev); struct nvkm_engine *engine = nvkm_engine(subdev);
if (engine->subdev.object.oclass)
return engine->subdev.object.oclass->ofuncs->fini(&engine->subdev.object, suspend);
if (engine->func->fini) if (engine->func->fini)
return engine->func->fini(engine, suspend); return engine->func->fini(engine, suspend);
return 0; return 0;
} }
static int static int
nvkm_engine_init(struct nvkm_subdev *obj) nvkm_engine_init(struct nvkm_subdev *subdev)
{ {
struct nvkm_engine *engine = container_of(obj, typeof(*engine), subdev); struct nvkm_engine *engine = nvkm_engine(subdev);
struct nvkm_subdev *subdev = &engine->subdev;
struct nvkm_fb *fb = subdev->device->fb; struct nvkm_fb *fb = subdev->device->fb;
int ret = 0, i; int ret = 0, i;
s64 time; s64 time;
...@@ -99,9 +96,6 @@ nvkm_engine_init(struct nvkm_subdev *obj) ...@@ -99,9 +96,6 @@ nvkm_engine_init(struct nvkm_subdev *obj)
return ret; return ret;
} }
if (engine->subdev.object.oclass)
return engine->subdev.object.oclass->ofuncs->init(&engine->subdev.object);
if (engine->func->oneinit && !engine->subdev.oneinit) { if (engine->func->oneinit && !engine->subdev.oneinit) {
nvkm_trace(subdev, "one-time init running...\n"); nvkm_trace(subdev, "one-time init running...\n");
time = ktime_to_us(ktime_get()); time = ktime_to_us(ktime_get());
...@@ -125,13 +119,9 @@ nvkm_engine_init(struct nvkm_subdev *obj) ...@@ -125,13 +119,9 @@ nvkm_engine_init(struct nvkm_subdev *obj)
} }
static void * static void *
nvkm_engine_dtor(struct nvkm_subdev *obj) nvkm_engine_dtor(struct nvkm_subdev *subdev)
{ {
struct nvkm_engine *engine = container_of(obj, typeof(*engine), subdev); struct nvkm_engine *engine = nvkm_engine(subdev);
if (engine->subdev.object.oclass) {
engine->subdev.object.oclass->ofuncs->dtor(&engine->subdev.object);
return NULL;
}
if (engine->func->dtor) if (engine->func->dtor)
return engine->func->dtor(engine); return engine->func->dtor(engine);
return engine; return engine;
...@@ -173,56 +163,3 @@ nvkm_engine_new_(const struct nvkm_engine_func *func, ...@@ -173,56 +163,3 @@ nvkm_engine_new_(const struct nvkm_engine_func *func,
return nvkm_engine_ctor(func, device, index, pmc_enable, return nvkm_engine_ctor(func, device, index, pmc_enable,
enable, *pengine); enable, *pengine);
} }
struct nvkm_engine *
nvkm_engine(void *obj, int idx)
{
obj = nvkm_subdev(obj, idx);
if (obj && nv_iclass(obj, NV_ENGINE_CLASS))
return nv_engine(obj);
return NULL;
}
int
nvkm_engine_create_(struct nvkm_object *parent, struct nvkm_object *engobj,
struct nvkm_oclass *oclass, bool enable,
const char *iname, const char *fname,
int length, void **pobject)
{
struct nvkm_engine *engine;
int ret;
ret = nvkm_subdev_create_(parent, engobj, oclass, NV_ENGINE_CLASS,
iname, fname, length, pobject);
engine = *pobject;
if (ret)
return ret;
if (parent) {
struct nvkm_device *device = nv_device(parent);
int engidx = nv_engidx(engine);
if (device->disable_mask & (1ULL << engidx)) {
if (!nvkm_boolopt(device->cfgopt, iname, false)) {
nvkm_debug(&engine->subdev,
"engine disabled by hw/fw\n");
return -ENODEV;
}
nvkm_warn(&engine->subdev,
"ignoring hw/fw engine disable\n");
}
if (!nvkm_boolopt(device->cfgopt, iname, enable)) {
if (!enable)
nvkm_warn(&engine->subdev,
"disabled, %s=1 to enable\n", iname);
return -ENODEV;
}
}
INIT_LIST_HEAD(&engine->contexts);
spin_lock_init(&engine->lock);
engine->subdev.func = &nvkm_engine_func;
return 0;
}
drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c
View file @ 68f3f702
...@@ -218,99 +218,6 @@ nvkm_gpuobj_new(struct nvkm_device *device, u32 size, int align, bool zero, ...@@ -218,99 +218,6 @@ nvkm_gpuobj_new(struct nvkm_device *device, u32 size, int align, bool zero,
return ret; return ret;
} }
void
nvkm_gpuobj_destroy(struct nvkm_gpuobj *gpuobj)
{
if (gpuobj->node)
nvkm_mm_free(&gpuobj->parent->heap, &gpuobj->node);
gpuobj->heap.block_size = 1;
nvkm_mm_fini(&gpuobj->heap);
nvkm_memory_del(&gpuobj->memory);
nvkm_object_destroy(&gpuobj->object);
}
#include <engine/fifo/chan.h>
int
nvkm_gpuobj_create_(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, u32 pclass,
struct nvkm_object *objgpu, u32 size, u32 align, u32 flags,
int length, void **pobject)
{
struct nvkm_device *device = nv_device(parent);
struct nvkm_gpuobj *pargpu = NULL;
struct nvkm_gpuobj *gpuobj;
struct nvkm_object *object = objgpu;
const bool zero = (flags & NVOBJ_FLAG_ZERO_ALLOC);
int ret;
*pobject = NULL;
while (object && object->func != &nvkm_fifo_chan_func)
object = object->parent;
if (object) {
struct nvkm_fifo_chan *chan = nvkm_fifo_chan(object);
pargpu = chan->inst;
} else
if (objgpu) {
while ((objgpu = nv_pclass(objgpu, NV_GPUOBJ_CLASS))) {
if (nv_gpuobj(objgpu)->heap.block_size)
break;
objgpu = objgpu->parent;
}
if (WARN_ON(objgpu == NULL))
return -EINVAL;
pargpu = nv_gpuobj(objgpu);
}
ret = nvkm_object_create_(parent, engine, oclass, pclass |
NV_GPUOBJ_CLASS, length, pobject);
gpuobj = *pobject;
if (ret)
return ret;
ret = nvkm_gpuobj_ctor(device, size, align, zero, pargpu, gpuobj);
if (!(flags & NVOBJ_FLAG_HEAP))
gpuobj->heap.block_size = 0;
return ret;
}
void
_nvkm_gpuobj_dtor(struct nvkm_object *object)
{
nvkm_gpuobj_destroy(nv_gpuobj(object));
}
int
_nvkm_gpuobj_init(struct nvkm_object *object)
{
return nvkm_gpuobj_init(nv_gpuobj(object));
}
int
_nvkm_gpuobj_fini(struct nvkm_object *object, bool suspend)
{
return nvkm_gpuobj_fini(nv_gpuobj(object), suspend);
}
u32
_nvkm_gpuobj_rd32(struct nvkm_object *object, u64 addr)
{
struct nvkm_gpuobj *gpuobj = nv_gpuobj(object);
return nvkm_ro32(gpuobj, addr);
}
void
_nvkm_gpuobj_wr32(struct nvkm_object *object, u64 addr, u32 data)
{
struct nvkm_gpuobj *gpuobj = nv_gpuobj(object);
nvkm_wo32(gpuobj, addr, data);
}
int int
nvkm_gpuobj_map(struct nvkm_gpuobj *gpuobj, struct nvkm_vm *vm, nvkm_gpuobj_map(struct nvkm_gpuobj *gpuobj, struct nvkm_vm *vm,
u32 access, struct nvkm_vma *vma) u32 access, struct nvkm_vma *vma)
......
drivers/gpu/drm/nouveau/nvkm/core/object.c
View file @ 68f3f702
...@@ -27,11 +27,6 @@ ...@@ -27,11 +27,6 @@
int int
nvkm_object_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size) nvkm_object_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size)
{ {
if (object->oclass) {
if (object->oclass->ofuncs->mthd)
return object->oclass->ofuncs->mthd(object, mthd, data, size);
return -ENODEV;
}
if (likely(object->func->mthd)) if (likely(object->func->mthd))
return object->func->mthd(object, mthd, data, size); return object->func->mthd(object, mthd, data, size);
return -ENODEV; return -ENODEV;
...@@ -41,11 +36,6 @@ int ...@@ -41,11 +36,6 @@ int
nvkm_object_ntfy(struct nvkm_object *object, u32 mthd, nvkm_object_ntfy(struct nvkm_object *object, u32 mthd,
struct nvkm_event **pevent) struct nvkm_event **pevent)
{ {
if (object->oclass) {
if (object->oclass->ofuncs->ntfy)
return object->oclass->ofuncs->ntfy(object, mthd, pevent);
return -ENODEV;
}
if (likely(object->func->ntfy)) if (likely(object->func->ntfy))
return object->func->ntfy(object, mthd, pevent); return object->func->ntfy(object, mthd, pevent);
return -ENODEV; return -ENODEV;
...@@ -54,11 +44,6 @@ nvkm_object_ntfy(struct nvkm_object *object, u32 mthd, ...@@ -54,11 +44,6 @@ nvkm_object_ntfy(struct nvkm_object *object, u32 mthd,
int int
nvkm_object_map(struct nvkm_object *object, u64 *addr, u32 *size) nvkm_object_map(struct nvkm_object *object, u64 *addr, u32 *size)
{ {
if (object->oclass) {
if (object->oclass->ofuncs->map)
return object->oclass->ofuncs->map(object, addr, size);
return -ENODEV;
}
if (likely(object->func->map)) if (likely(object->func->map))
return object->func->map(object, addr, size); return object->func->map(object, addr, size);
return -ENODEV; return -ENODEV;
...@@ -67,14 +52,6 @@ nvkm_object_map(struct nvkm_object *object, u64 *addr, u32 *size) ...@@ -67,14 +52,6 @@ nvkm_object_map(struct nvkm_object *object, u64 *addr, u32 *size)
int int
nvkm_object_rd08(struct nvkm_object *object, u64 addr, u8 *data) nvkm_object_rd08(struct nvkm_object *object, u64 addr, u8 *data)
{ {
if (object->oclass) {
if (object->oclass->ofuncs->rd08) {
*data = object->oclass->ofuncs->rd08(object, addr);
return 0;
}
*data = 0x00;
return -ENODEV;
}
if (likely(object->func->rd08)) if (likely(object->func->rd08))
return object->func->rd08(object, addr, data); return object->func->rd08(object, addr, data);
return -ENODEV; return -ENODEV;
...@@ -83,14 +60,6 @@ nvkm_object_rd08(struct nvkm_object *object, u64 addr, u8 *data) ...@@ -83,14 +60,6 @@ nvkm_object_rd08(struct nvkm_object *object, u64 addr, u8 *data)
int int
nvkm_object_rd16(struct nvkm_object *object, u64 addr, u16 *data) nvkm_object_rd16(struct nvkm_object *object, u64 addr, u16 *data)
{ {
if (object->oclass) {
if (object->oclass->ofuncs->rd16) {
*data = object->oclass->ofuncs->rd16(object, addr);
return 0;
}
*data = 0x0000;
return -ENODEV;
}
if (likely(object->func->rd16)) if (likely(object->func->rd16))
return object->func->rd16(object, addr, data); return object->func->rd16(object, addr, data);
return -ENODEV; return -ENODEV;
...@@ -99,14 +68,6 @@ nvkm_object_rd16(struct nvkm_object *object, u64 addr, u16 *data) ...@@ -99,14 +68,6 @@ nvkm_object_rd16(struct nvkm_object *object, u64 addr, u16 *data)
int int
nvkm_object_rd32(struct nvkm_object *object, u64 addr, u32 *data) nvkm_object_rd32(struct nvkm_object *object, u64 addr, u32 *data)
{ {
if (object->oclass) {
if (object->oclass->ofuncs->rd32) {
*data = object->oclass->ofuncs->rd32(object, addr);
return 0;
}
*data = 0x00000000;
return -ENODEV;
}
if (likely(object->func->rd32)) if (likely(object->func->rd32))
return object->func->rd32(object, addr, data); return object->func->rd32(object, addr, data);
return -ENODEV; return -ENODEV;
...@@ -115,13 +76,6 @@ nvkm_object_rd32(struct nvkm_object *object, u64 addr, u32 *data) ...@@ -115,13 +76,6 @@ nvkm_object_rd32(struct nvkm_object *object, u64 addr, u32 *data)
int int
nvkm_object_wr08(struct nvkm_object *object, u64 addr, u8 data) nvkm_object_wr08(struct nvkm_object *object, u64 addr, u8 data)
{ {
if (object->oclass) {
if (object->oclass->ofuncs->wr08) {
object->oclass->ofuncs->wr08(object, addr, data);
return 0;
}
return -ENODEV;
}
if (likely(object->func->wr08)) if (likely(object->func->wr08))
return object->func->wr08(object, addr, data); return object->func->wr08(object, addr, data);
return -ENODEV; return -ENODEV;
...@@ -130,13 +84,6 @@ nvkm_object_wr08(struct nvkm_object *object, u64 addr, u8 data) ...@@ -130,13 +84,6 @@ nvkm_object_wr08(struct nvkm_object *object, u64 addr, u8 data)
int int
nvkm_object_wr16(struct nvkm_object *object, u64 addr, u16 data) nvkm_object_wr16(struct nvkm_object *object, u64 addr, u16 data)
{ {
if (object->oclass) {
if (object->oclass->ofuncs->wr16) {
object->oclass->ofuncs->wr16(object, addr, data);
return 0;
}
return -ENODEV;
}
if (likely(object->func->wr16)) if (likely(object->func->wr16))
return object->func->wr16(object, addr, data); return object->func->wr16(object, addr, data);
return -ENODEV; return -ENODEV;
...@@ -145,13 +92,6 @@ nvkm_object_wr16(struct nvkm_object *object, u64 addr, u16 data) ...@@ -145,13 +92,6 @@ nvkm_object_wr16(struct nvkm_object *object, u64 addr, u16 data)
int int
nvkm_object_wr32(struct nvkm_object *object, u64 addr, u32 data) nvkm_object_wr32(struct nvkm_object *object, u64 addr, u32 data)
{ {
if (object->oclass) {
if (object->oclass->ofuncs->wr32) {
object->oclass->ofuncs->wr32(object, addr, data);
return 0;
}
return -ENODEV;
}
if (likely(object->func->wr32)) if (likely(object->func->wr32))
return object->func->wr32(object, addr, data); return object->func->wr32(object, addr, data);
return -ENODEV; return -ENODEV;
...@@ -161,8 +101,6 @@ int ...@@ -161,8 +101,6 @@ int
nvkm_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *gpuobj, nvkm_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *gpuobj,
int align, struct nvkm_gpuobj **pgpuobj) int align, struct nvkm_gpuobj **pgpuobj)
{ {
if (object->oclass)
return -ENODEV;
if (object->func->bind) if (object->func->bind)
return object->func->bind(object, gpuobj, align, pgpuobj); return object->func->bind(object, gpuobj, align, pgpuobj);
return -ENODEV; return -ENODEV;
...@@ -171,8 +109,6 @@ nvkm_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *gpuobj, ...@@ -171,8 +109,6 @@ nvkm_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *gpuobj,
int int
nvkm_object_fini(struct nvkm_object *object, bool suspend) nvkm_object_fini(struct nvkm_object *object, bool suspend)
{ {
if (object->oclass)
return object->oclass->ofuncs->fini(object, suspend);
if (object->func->fini) if (object->func->fini)
return object->func->fini(object, suspend); return object->func->fini(object, suspend);
return 0; return 0;
...@@ -181,8 +117,6 @@ nvkm_object_fini(struct nvkm_object *object, bool suspend) ...@@ -181,8 +117,6 @@ nvkm_object_fini(struct nvkm_object *object, bool suspend)
int int
nvkm_object_init(struct nvkm_object *object) nvkm_object_init(struct nvkm_object *object)
{ {
if (object->oclass)
return object->oclass->ofuncs->init(object);
if (object->func->init) if (object->func->init)
return object->func->init(object); return object->func->init(object);
return 0; return 0;
...@@ -193,11 +127,6 @@ nvkm_object_del(struct nvkm_object **pobject) ...@@ -193,11 +127,6 @@ nvkm_object_del(struct nvkm_object **pobject)
{ {
struct nvkm_object *object = *pobject; struct nvkm_object *object = *pobject;
if (object && object->oclass) {
object->oclass->ofuncs->dtor(object);
return;
}
if (object && !WARN_ON(!object->func)) { if (object && !WARN_ON(!object->func)) {
if (object->func->dtor) if (object->func->dtor)
*pobject = object->func->dtor(object); *pobject = object->func->dtor(object);
...@@ -214,14 +143,11 @@ nvkm_object_ctor(const struct nvkm_object_func *func, ...@@ -214,14 +143,11 @@ nvkm_object_ctor(const struct nvkm_object_func *func,
object->func = func; object->func = func;
object->client = oclass->client; object->client = oclass->client;
object->engine = nvkm_engine_ref(oclass->engine); object->engine = nvkm_engine_ref(oclass->engine);
object->oclass_name = oclass->base.oclass; object->oclass = oclass->base.oclass;
object->handle = oclass->handle; object->handle = oclass->handle;
object->parent = oclass->parent; object->parent = oclass->parent;
atomic_set(&object->refcount, 1); atomic_set(&object->refcount, 1);
atomic_set(&object->usecount, 0); atomic_set(&object->usecount, 0);
#ifdef NVKM_OBJECT_MAGIC
object->_magic = NVKM_OBJECT_MAGIC;
#endif
} }
int int
...@@ -251,97 +177,6 @@ nvkm_object_new(const struct nvkm_oclass *oclass, void *data, u32 size, ...@@ -251,97 +177,6 @@ nvkm_object_new(const struct nvkm_oclass *oclass, void *data, u32 size,
return nvkm_object_new_(func, oclass, data, size, pobject); return nvkm_object_new_(func, oclass, data, size, pobject);
} }
int
nvkm_object_create_(struct nvkm_object *parent, struct nvkm_object *engobj,
struct nvkm_oclass *oclass, u32 pclass,
int size, void **pobject)
{
struct nvkm_engine *engine = engobj ? nv_engine(engobj) : NULL;
struct nvkm_object *object;
object = *pobject = kzalloc(size, GFP_KERNEL);
if (!object)
return -ENOMEM;
nvkm_object_ref(parent, &object->parent);
object->engine = nvkm_engine_ref(engine);
object->oclass = oclass;
object->pclass = pclass;
atomic_set(&object->refcount, 1);
atomic_set(&object->usecount, 0);
#ifdef NVKM_OBJECT_MAGIC
object->_magic = NVKM_OBJECT_MAGIC;
#endif
return 0;
}
int
_nvkm_object_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject)
{
if (size != 0)
return -ENOSYS;
return nvkm_object_create(parent, engine, oclass, 0, pobject);
}
void
nvkm_object_destroy(struct nvkm_object *object)
{
nvkm_engine_unref(&object->engine);
nvkm_object_ref(NULL, &object->parent);
kfree(object);
}
int
_nvkm_object_init(struct nvkm_object *object)
{
return 0;
}
int
_nvkm_object_fini(struct nvkm_object *object, bool suspend)
{
return 0;
}
struct nvkm_ofuncs
nvkm_object_ofuncs = {
.ctor = _nvkm_object_ctor,
.dtor = nvkm_object_destroy,
.init = _nvkm_object_init,
.fini = _nvkm_object_fini,
};
int
nvkm_object_old(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject)
{
struct nvkm_ofuncs *ofuncs = oclass->ofuncs;
struct nvkm_object *object = NULL;
int ret;
ret = ofuncs->ctor(parent, engine, oclass, data, size, &object);
*pobject = object;
if (ret < 0) {
if (object) {
ofuncs->dtor(object);
*pobject = NULL;
}
return ret;
}
if (ret == 0) {
if (!nv_iclass(object, NV_SUBDEV_CLASS))
atomic_set(&object->refcount, 1);
}
return 0;
}
void void
nvkm_object_ref(struct nvkm_object *obj, struct nvkm_object **ref) nvkm_object_ref(struct nvkm_object *obj, struct nvkm_object **ref)
{ {
......
drivers/gpu/drm/nouveau/nvkm/core/oproxy.c
View file @ 68f3f702
...@@ -92,8 +92,6 @@ nvkm_oproxy_sclass(struct nvkm_object *object, int index, ...@@ -92,8 +92,6 @@ nvkm_oproxy_sclass(struct nvkm_object *object, int index,
{ {
struct nvkm_oproxy *oproxy = nvkm_oproxy(object); struct nvkm_oproxy *oproxy = nvkm_oproxy(object);
oclass->parent = oproxy->object; oclass->parent = oproxy->object;
if (oproxy->object->oclass)
return -ENOSYS;
if (!oproxy->object->func->sclass) if (!oproxy->object->func->sclass)
return -ENODEV; return -ENODEV;
return oproxy->object->func->sclass(oproxy->object, index, oclass); return oproxy->object->func->sclass(oproxy->object, index, oclass);
......
drivers/gpu/drm/nouveau/nvkm/core/ramht.c
View file @ 68f3f702
...@@ -67,40 +67,27 @@ nvkm_ramht_update(struct nvkm_ramht *ramht, int co, struct nvkm_object *object, ...@@ -67,40 +67,27 @@ nvkm_ramht_update(struct nvkm_ramht *ramht, int co, struct nvkm_object *object,
data->chid = chid; data->chid = chid;
data->handle = handle; data->handle = handle;
if (!object) { if (object) {
inst = 0; ret = nvkm_object_bind(object, ramht->parent, 16, &data->inst);
goto done; if (ret) {
} if (ret != -ENODEV) {
data->chid = -1;
if (nv_iclass(object, NV_GPUOBJ_CLASS)) { return ret;
struct nvkm_gpuobj *gpuobj = nv_gpuobj(object); }
if (ramht->device->card_type >= NV_50) data->inst = NULL;
inst = gpuobj->node->offset; }
else
inst = gpuobj->addr;
goto done;
}
ret = nvkm_object_bind(object, ramht->parent, 16, &data->inst); if (data->inst) {
if (ret) { if (ramht->device->card_type >= NV_50)
if (ret != -ENODEV) { inst = data->inst->node->offset;
data->chid = -1; else
return ret; inst = data->inst->addr;
} }
data->inst = NULL;
}
if (data->inst) { if (addr < 0) context |= inst << -addr;
if (ramht->device->card_type >= NV_50) else context |= inst >> addr;
inst = data->inst->node->offset;
else
inst = data->inst->addr;
} }
done:
if (addr < 0) context |= inst << -addr;
else context |= inst >> addr;
nvkm_kmap(ramht->gpuobj); nvkm_kmap(ramht->gpuobj);
nvkm_wo32(ramht->gpuobj, (co << 3) + 0, handle); nvkm_wo32(ramht->gpuobj, (co << 3) + 0, handle);
nvkm_wo32(ramht->gpuobj, (co << 3) + 4, context); nvkm_wo32(ramht->gpuobj, (co << 3) + 4, context);
......
drivers/gpu/drm/nouveau/nvkm/core/subdev.c
View file @ 68f3f702
...@@ -25,61 +25,55 @@ ...@@ -25,61 +25,55 @@
#include <core/device.h> #include <core/device.h>
#include <core/option.h> #include <core/option.h>
static struct lock_class_key nvkm_subdev_lock_class[NVDEV_SUBDEV_NR]; static struct lock_class_key nvkm_subdev_lock_class[NVKM_SUBDEV_NR];
const char * const char *
nvkm_subdev_name[64] = { nvkm_subdev_name[NVKM_SUBDEV_NR] = {
[NVDEV_SUBDEV_BAR ] = "bar", [NVKM_SUBDEV_BAR ] = "bar",
[NVDEV_SUBDEV_VBIOS ] = "bios", [NVKM_SUBDEV_VBIOS ] = "bios",
[NVDEV_SUBDEV_BUS ] = "bus", [NVKM_SUBDEV_BUS ] = "bus",
[NVDEV_SUBDEV_CLK ] = "clk", [NVKM_SUBDEV_CLK ] = "clk",
[NVDEV_SUBDEV_DEVINIT] = "devinit", [NVKM_SUBDEV_DEVINIT] = "devinit",
[NVDEV_SUBDEV_FB ] = "fb", [NVKM_SUBDEV_FB ] = "fb",
[NVDEV_SUBDEV_FUSE ] = "fuse", [NVKM_SUBDEV_FUSE ] = "fuse",
[NVDEV_SUBDEV_GPIO ] = "gpio", [NVKM_SUBDEV_GPIO ] = "gpio",
[NVDEV_SUBDEV_I2C ] = "i2c", [NVKM_SUBDEV_I2C ] = "i2c",
[NVDEV_SUBDEV_IBUS ] = "priv", [NVKM_SUBDEV_IBUS ] = "priv",
[NVDEV_SUBDEV_INSTMEM] = "imem", [NVKM_SUBDEV_INSTMEM] = "imem",
[NVDEV_SUBDEV_LTC ] = "ltc", [NVKM_SUBDEV_LTC ] = "ltc",
[NVDEV_SUBDEV_MC ] = "mc", [NVKM_SUBDEV_MC ] = "mc",
[NVDEV_SUBDEV_MMU ] = "mmu", [NVKM_SUBDEV_MMU ] = "mmu",
[NVDEV_SUBDEV_MXM ] = "mxm", [NVKM_SUBDEV_MXM ] = "mxm",
[NVDEV_SUBDEV_PMU ] = "pmu", [NVKM_SUBDEV_PMU ] = "pmu",
[NVDEV_SUBDEV_THERM ] = "therm", [NVKM_SUBDEV_THERM ] = "therm",
[NVDEV_SUBDEV_TIMER ] = "tmr", [NVKM_SUBDEV_TIMER ] = "tmr",
[NVDEV_SUBDEV_VOLT ] = "volt", [NVKM_SUBDEV_VOLT ] = "volt",
[NVDEV_ENGINE_BSP ] = "bsp", [NVKM_ENGINE_BSP ] = "bsp",
[NVDEV_ENGINE_CE0 ] = "ce0", [NVKM_ENGINE_CE0 ] = "ce0",
[NVDEV_ENGINE_CE1 ] = "ce1", [NVKM_ENGINE_CE1 ] = "ce1",
[NVDEV_ENGINE_CE2 ] = "ce2", [NVKM_ENGINE_CE2 ] = "ce2",
[NVDEV_ENGINE_CIPHER ] = "cipher", [NVKM_ENGINE_CIPHER ] = "cipher",
[NVDEV_ENGINE_DISP ] = "disp", [NVKM_ENGINE_DISP ] = "disp",
[NVDEV_ENGINE_DMAOBJ ] = "dma", [NVKM_ENGINE_DMAOBJ ] = "dma",
[NVDEV_ENGINE_FIFO ] = "fifo", [NVKM_ENGINE_FIFO ] = "fifo",
[NVDEV_ENGINE_GR ] = "gr", [NVKM_ENGINE_GR ] = "gr",
[NVDEV_ENGINE_IFB ] = "ifb", [NVKM_ENGINE_IFB ] = "ifb",
[NVDEV_ENGINE_ME ] = "me", [NVKM_ENGINE_ME ] = "me",
[NVDEV_ENGINE_MPEG ] = "mpeg", [NVKM_ENGINE_MPEG ] = "mpeg",
[NVDEV_ENGINE_MSENC ] = "msenc", [NVKM_ENGINE_MSENC ] = "msenc",
[NVDEV_ENGINE_MSPDEC ] = "mspdec", [NVKM_ENGINE_MSPDEC ] = "mspdec",
[NVDEV_ENGINE_MSPPP ] = "msppp", [NVKM_ENGINE_MSPPP ] = "msppp",
[NVDEV_ENGINE_MSVLD ] = "msvld", [NVKM_ENGINE_MSVLD ] = "msvld",
[NVDEV_ENGINE_PM ] = "pm", [NVKM_ENGINE_PM ] = "pm",
[NVDEV_ENGINE_SEC ] = "sec", [NVKM_ENGINE_SEC ] = "sec",
[NVDEV_ENGINE_SW ] = "sw", [NVKM_ENGINE_SW ] = "sw",
[NVDEV_ENGINE_VIC ] = "vic", [NVKM_ENGINE_VIC ] = "vic",
[NVDEV_ENGINE_VP ] = "vp", [NVKM_ENGINE_VP ] = "vp",
}; };
void void
nvkm_subdev_intr(struct nvkm_subdev *subdev) nvkm_subdev_intr(struct nvkm_subdev *subdev)
{ {
if (subdev->object.oclass) {
if (subdev->intr)
subdev->intr(subdev);
return;
}
if (subdev->func->intr) if (subdev->func->intr)
subdev->func->intr(subdev); subdev->func->intr(subdev);
} }
...@@ -91,18 +85,10 @@ nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend) ...@@ -91,18 +85,10 @@ nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend)
const char *action = suspend ? "suspend" : "fini"; const char *action = suspend ? "suspend" : "fini";
u32 pmc_enable = subdev->pmc_enable; u32 pmc_enable = subdev->pmc_enable;
s64 time; s64 time;
int ret;
nvkm_trace(subdev, "%s running...\n", action); nvkm_trace(subdev, "%s running...\n", action);
time = ktime_to_us(ktime_get()); time = ktime_to_us(ktime_get());
if (!subdev->func) {
ret = subdev->object.oclass->ofuncs->fini(&subdev->object, suspend);
if (ret)
return ret;
goto done;
}
if (subdev->func->fini) { if (subdev->func->fini) {
int ret = subdev->func->fini(subdev, suspend); int ret = subdev->func->fini(subdev, suspend);
if (ret) { if (ret) {
...@@ -118,7 +104,6 @@ nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend) ...@@ -118,7 +104,6 @@ nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend)
nvkm_rd32(device, 0x000200); nvkm_rd32(device, 0x000200);
} }
done:
time = ktime_to_us(ktime_get()) - time; time = ktime_to_us(ktime_get()) - time;
nvkm_trace(subdev, "%s completed in %lldus\n", action, time); nvkm_trace(subdev, "%s completed in %lldus\n", action, time);
return 0; return 0;
...@@ -132,7 +117,7 @@ nvkm_subdev_preinit(struct nvkm_subdev *subdev) ...@@ -132,7 +117,7 @@ nvkm_subdev_preinit(struct nvkm_subdev *subdev)
nvkm_trace(subdev, "preinit running...\n"); nvkm_trace(subdev, "preinit running...\n");
time = ktime_to_us(ktime_get()); time = ktime_to_us(ktime_get());
if (!subdev->object.oclass && subdev->func->preinit) { if (subdev->func->preinit) {
int ret = subdev->func->preinit(subdev); int ret = subdev->func->preinit(subdev);
if (ret) { if (ret) {
nvkm_error(subdev, "preinit failed, %d\n", ret); nvkm_error(subdev, "preinit failed, %d\n", ret);
...@@ -154,13 +139,6 @@ nvkm_subdev_init(struct nvkm_subdev *subdev) ...@@ -154,13 +139,6 @@ nvkm_subdev_init(struct nvkm_subdev *subdev)
nvkm_trace(subdev, "init running...\n"); nvkm_trace(subdev, "init running...\n");
time = ktime_to_us(ktime_get()); time = ktime_to_us(ktime_get());
if (!subdev->func) {
ret = subdev->object.oclass->ofuncs->init(&subdev->object);
if (ret)
return ret;
goto done;
}
if (subdev->func->oneinit && !subdev->oneinit) { if (subdev->func->oneinit && !subdev->oneinit) {
s64 time; s64 time;
nvkm_trace(subdev, "one-time init running...\n"); nvkm_trace(subdev, "one-time init running...\n");
...@@ -184,7 +162,6 @@ nvkm_subdev_init(struct nvkm_subdev *subdev) ...@@ -184,7 +162,6 @@ nvkm_subdev_init(struct nvkm_subdev *subdev)
} }
} }
done:
time = ktime_to_us(ktime_get()) - time; time = ktime_to_us(ktime_get()) - time;
nvkm_trace(subdev, "init completed in %lldus\n", time); nvkm_trace(subdev, "init completed in %lldus\n", time);
return 0; return 0;
...@@ -196,11 +173,6 @@ nvkm_subdev_del(struct nvkm_subdev **psubdev) ...@@ -196,11 +173,6 @@ nvkm_subdev_del(struct nvkm_subdev **psubdev)
struct nvkm_subdev *subdev = *psubdev; struct nvkm_subdev *subdev = *psubdev;
s64 time; s64 time;
if (subdev && subdev->object.oclass) {
subdev->object.oclass->ofuncs->dtor(&subdev->object);
return;
}
if (subdev && !WARN_ON(!subdev->func)) { if (subdev && !WARN_ON(!subdev->func)) {
nvkm_trace(subdev, "destroy running...\n"); nvkm_trace(subdev, "destroy running...\n");
time = ktime_to_us(ktime_get()); time = ktime_to_us(ktime_get());
...@@ -213,18 +185,12 @@ nvkm_subdev_del(struct nvkm_subdev **psubdev) ...@@ -213,18 +185,12 @@ nvkm_subdev_del(struct nvkm_subdev **psubdev)
} }
} }
static const struct nvkm_object_func
nvkm_subdev_func = {
};
void void
nvkm_subdev_ctor(const struct nvkm_subdev_func *func, nvkm_subdev_ctor(const struct nvkm_subdev_func *func,
struct nvkm_device *device, int index, u32 pmc_enable, struct nvkm_device *device, int index, u32 pmc_enable,
struct nvkm_subdev *subdev) struct nvkm_subdev *subdev)
{ {
const char *name = nvkm_subdev_name[index]; const char *name = nvkm_subdev_name[index];
struct nvkm_oclass hack = {};
nvkm_object_ctor(&nvkm_subdev_func, &hack, &subdev->object);
subdev->func = func; subdev->func = func;
subdev->device = device; subdev->device = device;
subdev->index = index; subdev->index = index;
...@@ -233,106 +199,3 @@ nvkm_subdev_ctor(const struct nvkm_subdev_func *func, ...@@ -233,106 +199,3 @@ nvkm_subdev_ctor(const struct nvkm_subdev_func *func,
__mutex_init(&subdev->mutex, name, &nvkm_subdev_lock_class[index]); __mutex_init(&subdev->mutex, name, &nvkm_subdev_lock_class[index]);
subdev->debug = nvkm_dbgopt(device->dbgopt, name); subdev->debug = nvkm_dbgopt(device->dbgopt, name);
} }
struct nvkm_subdev *
nvkm_subdev(void *obj, int idx)
{
struct nvkm_object *object = nv_object(obj);
while (object && !nv_iclass(object, NV_SUBDEV_CLASS))
object = object->parent;
if (object == NULL || !object->parent || nv_subidx(nv_subdev(object)) != idx) {
struct nvkm_device *device = nv_device(obj);
return nvkm_device_subdev(device, idx);
}
return object ? nv_subdev(object) : NULL;
}
void
nvkm_subdev_reset(struct nvkm_object *obj)
{
struct nvkm_subdev *subdev = container_of(obj, typeof(*subdev), object);
nvkm_trace(subdev, "resetting...\n");
nvkm_object_fini(&subdev->object, false);
nvkm_trace(subdev, "reset\n");
}
int
nvkm_subdev_init_old(struct nvkm_subdev *subdev)
{
int ret = _nvkm_object_init(&subdev->object);
if (ret)
return ret;
nvkm_subdev_reset(&subdev->object);
return 0;
}
int
_nvkm_subdev_init(struct nvkm_object *object)
{
struct nvkm_subdev *subdev = (void *)object;
return nvkm_subdev_init_old(subdev);
}
int
nvkm_subdev_fini_old(struct nvkm_subdev *subdev, bool suspend)
{
struct nvkm_device *device = subdev->device;
if (subdev->unit) {
nvkm_mask(device, 0x000200, subdev->unit, 0x00000000);
nvkm_mask(device, 0x000200, subdev->unit, subdev->unit);
}
return _nvkm_object_fini(&subdev->object, suspend);
}
int
_nvkm_subdev_fini(struct nvkm_object *object, bool suspend)
{
struct nvkm_subdev *subdev = (void *)object;
return nvkm_subdev_fini_old(subdev, suspend);
}
void
nvkm_subdev_destroy(struct nvkm_subdev *subdev)
{
nvkm_object_destroy(&subdev->object);
}
void
_nvkm_subdev_dtor(struct nvkm_object *object)
{
nvkm_subdev_destroy(nv_subdev(object));
}
int
nvkm_subdev_create_(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, u32 pclass,
const char *subname, const char *sysname,
int size, void **pobject)
{
const int subidx = oclass->handle & 0xff;
const char *name = nvkm_subdev_name[subidx];
struct nvkm_subdev *subdev;
int ret;
ret = nvkm_object_create_(parent, engine, oclass, pclass |
NV_SUBDEV_CLASS, size, pobject);
subdev = *pobject;
if (ret)
return ret;
__mutex_init(&subdev->mutex, name, &nvkm_subdev_lock_class[subidx]);
subdev->index = subidx;
if (parent) {
struct nvkm_device *device = nv_device(parent);
subdev->debug = nvkm_dbgopt(device->dbgopt, name);
subdev->device = device;
} else {
subdev->device = nv_device(subdev);
}
return 0;
}
drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c
View file @ 68f3f702
...@@ -30,7 +30,7 @@ static void ...@@ -30,7 +30,7 @@ static void
gf100_ce_init(struct nvkm_falcon *ce) gf100_ce_init(struct nvkm_falcon *ce)
{ {
struct nvkm_device *device = ce->engine.subdev.device; struct nvkm_device *device = ce->engine.subdev.device;
const int index = ce->engine.subdev.index - NVDEV_ENGINE_CE0; const int index = ce->engine.subdev.index - NVKM_ENGINE_CE0;
nvkm_wr32(device, ce->addr + 0x084, index); nvkm_wr32(device, ce->addr + 0x084, index);
} }
...@@ -68,11 +68,11 @@ int ...@@ -68,11 +68,11 @@ int
gf100_ce_new(struct nvkm_device *device, int index, gf100_ce_new(struct nvkm_device *device, int index,
struct nvkm_engine **pengine) struct nvkm_engine **pengine)
{ {
if (index == NVDEV_ENGINE_CE0) { if (index == NVKM_ENGINE_CE0) {
return nvkm_falcon_new_(&gf100_ce0, device, index, true, return nvkm_falcon_new_(&gf100_ce0, device, index, true,
0x104000, pengine); 0x104000, pengine);
} else } else
if (index == NVDEV_ENGINE_CE1) { if (index == NVKM_ENGINE_CE1) {
return nvkm_falcon_new_(&gf100_ce1, device, index, true, return nvkm_falcon_new_(&gf100_ce1, device, index, true,
0x105000, pengine); 0x105000, pengine);
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
View file @ 68f3f702
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
void void
gk104_ce_intr(struct nvkm_engine *ce) gk104_ce_intr(struct nvkm_engine *ce)
{ {
const u32 base = (ce->subdev.index - NVDEV_ENGINE_CE0) * 0x1000; const u32 base = (ce->subdev.index - NVKM_ENGINE_CE0) * 0x1000;
struct nvkm_subdev *subdev = &ce->subdev; struct nvkm_subdev *subdev = &ce->subdev;
struct nvkm_device *device = subdev->device; struct nvkm_device *device = subdev->device;
u32 stat = nvkm_rd32(device, 0x104908 + base); u32 stat = nvkm_rd32(device, 0x104908 + base);
...@@ -51,15 +51,15 @@ int ...@@ -51,15 +51,15 @@ int
gk104_ce_new(struct nvkm_device *device, int index, gk104_ce_new(struct nvkm_device *device, int index,
struct nvkm_engine **pengine) struct nvkm_engine **pengine)
{ {
if (index == NVDEV_ENGINE_CE0) { if (index == NVKM_ENGINE_CE0) {
return nvkm_engine_new_(&gk104_ce, device, index, return nvkm_engine_new_(&gk104_ce, device, index,
0x00000040, true, pengine); 0x00000040, true, pengine);
} else } else
if (index == NVDEV_ENGINE_CE1) { if (index == NVKM_ENGINE_CE1) {
return nvkm_engine_new_(&gk104_ce, device, index, return nvkm_engine_new_(&gk104_ce, device, index,
0x00000080, true, pengine); 0x00000080, true, pengine);
} else } else
if (index == NVDEV_ENGINE_CE2) { if (index == NVKM_ENGINE_CE2) {
return nvkm_engine_new_(&gk104_ce, device, index, return nvkm_engine_new_(&gk104_ce, device, index,
0x00200000, true, pengine); 0x00200000, true, pengine);
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c
View file @ 68f3f702
...@@ -38,15 +38,15 @@ int ...@@ -38,15 +38,15 @@ int
gm204_ce_new(struct nvkm_device *device, int index, gm204_ce_new(struct nvkm_device *device, int index,
struct nvkm_engine **pengine) struct nvkm_engine **pengine)
{ {
if (index == NVDEV_ENGINE_CE0) { if (index == NVKM_ENGINE_CE0) {
return nvkm_engine_new_(&gm204_ce, device, index, return nvkm_engine_new_(&gm204_ce, device, index,
0x00000040, true, pengine); 0x00000040, true, pengine);
} else } else
if (index == NVDEV_ENGINE_CE1) { if (index == NVKM_ENGINE_CE1) {
return nvkm_engine_new_(&gm204_ce, device, index, return nvkm_engine_new_(&gm204_ce, device, index,
0x00000080, true, pengine); 0x00000080, true, pengine);
} else } else
if (index == NVDEV_ENGINE_CE2) { if (index == NVKM_ENGINE_CE2) {
return nvkm_engine_new_(&gm204_ce, device, index, return nvkm_engine_new_(&gm204_ce, device, index,
0x00200000, true, pengine); 0x00200000, true, pengine);
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c
View file @ 68f3f702
...@@ -44,7 +44,7 @@ gt215_ce_intr(struct nvkm_falcon *ce, struct nvkm_fifo_chan *chan) ...@@ -44,7 +44,7 @@ gt215_ce_intr(struct nvkm_falcon *ce, struct nvkm_fifo_chan *chan)
{ {
struct nvkm_subdev *subdev = &ce->engine.subdev; struct nvkm_subdev *subdev = &ce->engine.subdev;
struct nvkm_device *device = subdev->device; struct nvkm_device *device = subdev->device;
const u32 base = (subdev->index - NVDEV_ENGINE_CE0) * 0x1000; const u32 base = (subdev->index - NVKM_ENGINE_CE0) * 0x1000;
u32 ssta = nvkm_rd32(device, 0x104040 + base) & 0x0000ffff; u32 ssta = nvkm_rd32(device, 0x104040 + base) & 0x0000ffff;
u32 addr = nvkm_rd32(device, 0x104040 + base) >> 16; u32 addr = nvkm_rd32(device, 0x104040 + base) >> 16;
u32 mthd = (addr & 0x07ff) << 2; u32 mthd = (addr & 0x07ff) << 2;
......
drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c
View file @ 68f3f702
...@@ -38,7 +38,7 @@ g84_cipher_oclass_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent, ...@@ -38,7 +38,7 @@ g84_cipher_oclass_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent,
align, false, parent, pgpuobj); align, false, parent, pgpuobj);
if (ret == 0) { if (ret == 0) {
nvkm_kmap(*pgpuobj); nvkm_kmap(*pgpuobj);
nvkm_wo32(*pgpuobj, 0x00, object->oclass_name); nvkm_wo32(*pgpuobj, 0x00, object->oclass);
nvkm_wo32(*pgpuobj, 0x04, 0x00000000); nvkm_wo32(*pgpuobj, 0x04, 0x00000000);
nvkm_wo32(*pgpuobj, 0x08, 0x00000000); nvkm_wo32(*pgpuobj, 0x08, 0x00000000);
nvkm_wo32(*pgpuobj, 0x0c, 0x00000000); nvkm_wo32(*pgpuobj, 0x0c, 0x00000000);
......
drivers/gpu/drm/nouveau/nvkm/engine/device/Kbuild
View file @ 68f3f702
...@@ -4,13 +4,3 @@ nvkm-y += nvkm/engine/device/ctrl.o ...@@ -4,13 +4,3 @@ nvkm-y += nvkm/engine/device/ctrl.o
nvkm-y += nvkm/engine/device/pci.o nvkm-y += nvkm/engine/device/pci.o
nvkm-y += nvkm/engine/device/tegra.o nvkm-y += nvkm/engine/device/tegra.o
nvkm-y += nvkm/engine/device/user.o nvkm-y += nvkm/engine/device/user.o
nvkm-y += nvkm/engine/device/nv04.o
nvkm-y += nvkm/engine/device/nv10.o
nvkm-y += nvkm/engine/device/nv20.o
nvkm-y += nvkm/engine/device/nv30.o
nvkm-y += nvkm/engine/device/nv40.o
nvkm-y += nvkm/engine/device/nv50.o
nvkm-y += nvkm/engine/device/gf100.o
nvkm-y += nvkm/engine/device/gk104.o
nvkm-y += nvkm/engine/device/gm100.o
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @ 68f3f702
...@@ -1975,36 +1975,6 @@ nv12b_chipset = { ...@@ -1975,36 +1975,6 @@ nv12b_chipset = {
.sw = gf100_sw_new, .sw = gf100_sw_new,
}; };
#include <core/client.h>
struct nvkm_device *
nv_device(void *obj)
{
struct nvkm_object *device = nv_object(obj);
if (device->engine == NULL) {
while (device && device->parent) {
if (!nv_iclass(device, NV_SUBDEV_CLASS) &&
device->parent == &nvkm_client(device)->object) {
struct {
struct nvkm_object base;
struct nvkm_device *device;
} *udevice = (void *)device;
return udevice->device;
}
device = device->parent;
}
} else {
device = &nv_object(obj)->engine->subdev.object;
if (device && device->parent)
device = device->parent;
}
#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
BUG_ON(!device);
#endif
return (void *)device;
}
static int static int
nvkm_device_event_ctor(struct nvkm_object *object, void *data, u32 size, nvkm_device_event_ctor(struct nvkm_object *object, void *data, u32 size,
struct nvkm_notify *notify) struct nvkm_notify *notify)
...@@ -2032,7 +2002,7 @@ nvkm_device_subdev(struct nvkm_device *device, int index) ...@@ -2032,7 +2002,7 @@ nvkm_device_subdev(struct nvkm_device *device, int index)
return NULL; return NULL;
switch (index) { switch (index) {
#define _(n,p,m) case NVDEV_SUBDEV_##n: if (p) return (m); break #define _(n,p,m) case NVKM_SUBDEV_##n: if (p) return (m); break
_(BAR , device->bar , &device->bar->subdev); _(BAR , device->bar , &device->bar->subdev);
_(VBIOS , device->bios , &device->bios->subdev); _(VBIOS , device->bios , &device->bios->subdev);
_(BUS , device->bus , &device->bus->subdev); _(BUS , device->bus , &device->bus->subdev);
...@@ -2069,7 +2039,7 @@ nvkm_device_engine(struct nvkm_device *device, int index) ...@@ -2069,7 +2039,7 @@ nvkm_device_engine(struct nvkm_device *device, int index)
return NULL; return NULL;
switch (index) { switch (index) {
#define _(n,p,m) case NVDEV_ENGINE_##n: if (p) return (m); break #define _(n,p,m) case NVKM_ENGINE_##n: if (p) return (m); break
_(BSP , device->bsp , device->bsp); _(BSP , device->bsp , device->bsp);
_(CE0 , device->ce[0] , device->ce[0]); _(CE0 , device->ce[0] , device->ce[0]);
_(CE1 , device->ce[1] , device->ce[1]); _(CE1 , device->ce[1] , device->ce[1]);
...@@ -2112,7 +2082,7 @@ nvkm_device_fini(struct nvkm_device *device, bool suspend) ...@@ -2112,7 +2082,7 @@ nvkm_device_fini(struct nvkm_device *device, bool suspend)
nvkm_acpi_fini(device); nvkm_acpi_fini(device);
for (i = NVDEV_SUBDEV_NR - 1; i >= 0; i--) { for (i = NVKM_SUBDEV_NR - 1; i >= 0; i--) {
if ((subdev = nvkm_device_subdev(device, i))) { if ((subdev = nvkm_device_subdev(device, i))) {
ret = nvkm_subdev_fini(subdev, suspend); ret = nvkm_subdev_fini(subdev, suspend);
if (ret && suspend) if (ret && suspend)
...@@ -2135,7 +2105,7 @@ nvkm_device_fini(struct nvkm_device *device, bool suspend) ...@@ -2135,7 +2105,7 @@ nvkm_device_fini(struct nvkm_device *device, bool suspend)
if (rret) if (rret)
nvkm_fatal(subdev, "failed restart, %d\n", ret); nvkm_fatal(subdev, "failed restart, %d\n", ret);
} }
} while (++i < NVDEV_SUBDEV_NR); } while (++i < NVKM_SUBDEV_NR);
nvdev_trace(device, "%s failed with %d\n", action, ret); nvdev_trace(device, "%s failed with %d\n", action, ret);
return ret; return ret;
...@@ -2157,7 +2127,7 @@ nvkm_device_preinit(struct nvkm_device *device) ...@@ -2157,7 +2127,7 @@ nvkm_device_preinit(struct nvkm_device *device)
goto fail; goto fail;
} }
for (i = 0; i < NVDEV_SUBDEV_NR; i++) { for (i = 0; i < NVKM_SUBDEV_NR; i++) {
if ((subdev = nvkm_device_subdev(device, i))) { if ((subdev = nvkm_device_subdev(device, i))) {
ret = nvkm_subdev_preinit(subdev); ret = nvkm_subdev_preinit(subdev);
if (ret) if (ret)
...@@ -2182,7 +2152,7 @@ int ...@@ -2182,7 +2152,7 @@ int
nvkm_device_init(struct nvkm_device *device) nvkm_device_init(struct nvkm_device *device)
{ {
struct nvkm_subdev *subdev; struct nvkm_subdev *subdev;
int ret, i = 0, c; int ret, i;
s64 time; s64 time;
ret = nvkm_device_preinit(device); ret = nvkm_device_preinit(device);
...@@ -2194,80 +2164,11 @@ nvkm_device_init(struct nvkm_device *device) ...@@ -2194,80 +2164,11 @@ nvkm_device_init(struct nvkm_device *device)
nvdev_trace(device, "init running...\n"); nvdev_trace(device, "init running...\n");
time = ktime_to_us(ktime_get()); time = ktime_to_us(ktime_get());
for (i = 0, c = 0; i < NVDEV_SUBDEV_NR; i++) { for (i = 0; i < NVKM_SUBDEV_NR; i++) {
#define _(s,m) case s: if (device->oclass[s] && !device->m) { \ if ((subdev = nvkm_device_subdev(device, i))) {
ret = nvkm_object_old(nv_object(device), NULL, \ ret = nvkm_subdev_init(subdev);
device->oclass[s], NULL, (s), \ if (ret)
(struct nvkm_object **)&device->m); \ goto fail;
if (ret == -ENODEV) { \
device->oclass[s] = NULL; \
continue; \
} \
if (ret) \
goto fail; \
} break
switch (i) {
_(NVDEV_SUBDEV_BAR , bar);
_(NVDEV_SUBDEV_VBIOS , bios);
_(NVDEV_SUBDEV_BUS , bus);
_(NVDEV_SUBDEV_CLK , clk);
_(NVDEV_SUBDEV_DEVINIT, devinit);
_(NVDEV_SUBDEV_FB , fb);
_(NVDEV_SUBDEV_FUSE , fuse);
_(NVDEV_SUBDEV_GPIO , gpio);
_(NVDEV_SUBDEV_I2C , i2c);
_(NVDEV_SUBDEV_IBUS , ibus);
_(NVDEV_SUBDEV_INSTMEM, imem);
_(NVDEV_SUBDEV_LTC , ltc);
_(NVDEV_SUBDEV_MC , mc);
_(NVDEV_SUBDEV_MMU , mmu);
_(NVDEV_SUBDEV_MXM , mxm);
_(NVDEV_SUBDEV_PMU , pmu);
_(NVDEV_SUBDEV_THERM , therm);
_(NVDEV_SUBDEV_TIMER , timer);
_(NVDEV_SUBDEV_VOLT , volt);
_(NVDEV_ENGINE_BSP , bsp);
_(NVDEV_ENGINE_CE0 , ce[0]);
_(NVDEV_ENGINE_CE1 , ce[1]);
_(NVDEV_ENGINE_CE2 , ce[2]);
_(NVDEV_ENGINE_CIPHER , cipher);
_(NVDEV_ENGINE_DISP , disp);
_(NVDEV_ENGINE_DMAOBJ , dma);
_(NVDEV_ENGINE_FIFO , fifo);
_(NVDEV_ENGINE_GR , gr);
_(NVDEV_ENGINE_IFB , ifb);
_(NVDEV_ENGINE_ME , me);
_(NVDEV_ENGINE_MPEG , mpeg);
_(NVDEV_ENGINE_MSENC , msenc);
_(NVDEV_ENGINE_MSPDEC , mspdec);
_(NVDEV_ENGINE_MSPPP , msppp);
_(NVDEV_ENGINE_MSVLD , msvld);
_(NVDEV_ENGINE_PM , pm);
_(NVDEV_ENGINE_SEC , sec);
_(NVDEV_ENGINE_SW , sw);
_(NVDEV_ENGINE_VIC , vic);
_(NVDEV_ENGINE_VP , vp);
default:
WARN_ON(1);
continue;
}
#undef _
/* note: can't init *any* subdevs until devinit has been run
* due to not knowing exactly what the vbios init tables will
* mess with. devinit also can't be run until all of its
* dependencies have been created.
*
* this code delays init of any subdev until all of devinit's
* dependencies have been created, and then initialises each
* subdev in turn as they're created.
*/
while (i >= NVDEV_SUBDEV_DEVINIT_LAST && c <= i) {
if ((subdev = nvkm_device_subdev(device, c++))) {
ret = nvkm_subdev_init(subdev);
if (ret)
goto fail;
}
} }
} }
...@@ -2336,7 +2237,7 @@ nvkm_device_del(struct nvkm_device **pdevice) ...@@ -2336,7 +2237,7 @@ nvkm_device_del(struct nvkm_device **pdevice)
if (device) { if (device) {
mutex_lock(&nv_devices_mutex); mutex_lock(&nv_devices_mutex);
device->disable_mask = 0; device->disable_mask = 0;
for (i = NVDEV_SUBDEV_NR - 1; i >= 0; i--) { for (i = NVKM_SUBDEV_NR - 1; i >= 0; i--) {
struct nvkm_subdev *subdev = struct nvkm_subdev *subdev =
nvkm_device_subdev(device, i); nvkm_device_subdev(device, i);
nvkm_subdev_del(&subdev); nvkm_subdev_del(&subdev);
...@@ -2357,10 +2258,6 @@ nvkm_device_del(struct nvkm_device **pdevice) ...@@ -2357,10 +2258,6 @@ nvkm_device_del(struct nvkm_device **pdevice)
} }
} }
static const struct nvkm_engine_func
nvkm_device_func = {
};
int int
nvkm_device_ctor(const struct nvkm_device_func *func, nvkm_device_ctor(const struct nvkm_device_func *func,
const struct nvkm_device_quirk *quirk, const struct nvkm_device_quirk *quirk,
...@@ -2397,12 +2294,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func, ...@@ -2397,12 +2294,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
device->dbgopt = dbg; device->dbgopt = dbg;
device->name = name; device->name = name;
list_add_tail(&device->head, &nv_devices); list_add_tail(&device->head, &nv_devices);
device->debug = nvkm_dbgopt(device->dbgopt, "device");
ret = nvkm_engine_ctor(&nvkm_device_func, device, 0, 0,
true, &device->engine);
device->engine.subdev.object.parent = NULL;
if (ret)
goto done;
ret = nvkm_event_init(&nvkm_device_event_func, 1, 1, &device->event); ret = nvkm_event_init(&nvkm_device_event_func, 1, 1, &device->event);
if (ret) if (ret)
...@@ -2472,23 +2364,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func, ...@@ -2472,23 +2364,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
device->card_type = NV_04; device->card_type = NV_04;
} }
switch (device->card_type) { switch (device->chipset) {
case NV_04: ret = nv04_identify(device); break;
case NV_10:
case NV_11: ret = nv10_identify(device); break;
case NV_20: ret = nv20_identify(device); break;
case NV_30: ret = nv30_identify(device); break;
case NV_40: ret = nv40_identify(device); break;
case NV_50: ret = nv50_identify(device); break;
case NV_C0: ret = gf100_identify(device); break;
case NV_E0: ret = gk104_identify(device); break;
case GM100: ret = gm100_identify(device); break;
default:
ret = -EINVAL;
break;
}
switch (!ret * device->chipset) {
case 0x004: device->chip = &nv4_chipset; break; case 0x004: device->chip = &nv4_chipset; break;
case 0x005: device->chip = &nv5_chipset; break; case 0x005: device->chip = &nv5_chipset; break;
case 0x010: device->chip = &nv10_chipset; break; case 0x010: device->chip = &nv10_chipset; break;
...@@ -2594,16 +2470,9 @@ nvkm_device_ctor(const struct nvkm_device_func *func, ...@@ -2594,16 +2470,9 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
} }
} }
/* disable subdevs that aren't required (used by tools) */
for (i = 0; i < NVDEV_SUBDEV_NR; i++) {
if (!(subdev_mask & (1ULL << i)))
device->oclass[i] = NULL;
}
atomic_set(&device->engine.subdev.object.usecount, 2);
mutex_init(&device->mutex); mutex_init(&device->mutex);
for (i = 0; i < NVDEV_SUBDEV_NR; i++) { for (i = 0; i < NVKM_SUBDEV_NR; i++) {
#define _(s,m) case s: \ #define _(s,m) case s: \
if (device->chip->m && (subdev_mask & (1ULL << (s)))) { \ if (device->chip->m && (subdev_mask & (1ULL << (s)))) { \
ret = device->chip->m(device, (s), &device->m); \ ret = device->chip->m(device, (s), &device->m); \
...@@ -2620,46 +2489,46 @@ nvkm_device_ctor(const struct nvkm_device_func *func, ...@@ -2620,46 +2489,46 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
} \ } \
break break
switch (i) { switch (i) {
_(NVDEV_SUBDEV_BAR , bar); _(NVKM_SUBDEV_BAR , bar);
_(NVDEV_SUBDEV_VBIOS , bios); _(NVKM_SUBDEV_VBIOS , bios);
_(NVDEV_SUBDEV_BUS , bus); _(NVKM_SUBDEV_BUS , bus);
_(NVDEV_SUBDEV_CLK , clk); _(NVKM_SUBDEV_CLK , clk);
_(NVDEV_SUBDEV_DEVINIT, devinit); _(NVKM_SUBDEV_DEVINIT, devinit);
_(NVDEV_SUBDEV_FB , fb); _(NVKM_SUBDEV_FB , fb);
_(NVDEV_SUBDEV_FUSE , fuse); _(NVKM_SUBDEV_FUSE , fuse);
_(NVDEV_SUBDEV_GPIO , gpio); _(NVKM_SUBDEV_GPIO , gpio);
_(NVDEV_SUBDEV_I2C , i2c); _(NVKM_SUBDEV_I2C , i2c);
_(NVDEV_SUBDEV_IBUS , ibus); _(NVKM_SUBDEV_IBUS , ibus);
_(NVDEV_SUBDEV_INSTMEM, imem); _(NVKM_SUBDEV_INSTMEM, imem);
_(NVDEV_SUBDEV_LTC , ltc); _(NVKM_SUBDEV_LTC , ltc);
_(NVDEV_SUBDEV_MC , mc); _(NVKM_SUBDEV_MC , mc);
_(NVDEV_SUBDEV_MMU , mmu); _(NVKM_SUBDEV_MMU , mmu);
_(NVDEV_SUBDEV_MXM , mxm); _(NVKM_SUBDEV_MXM , mxm);
_(NVDEV_SUBDEV_PMU , pmu); _(NVKM_SUBDEV_PMU , pmu);
_(NVDEV_SUBDEV_THERM , therm); _(NVKM_SUBDEV_THERM , therm);
_(NVDEV_SUBDEV_TIMER , timer); _(NVKM_SUBDEV_TIMER , timer);
_(NVDEV_SUBDEV_VOLT , volt); _(NVKM_SUBDEV_VOLT , volt);
_(NVDEV_ENGINE_BSP , bsp); _(NVKM_ENGINE_BSP , bsp);
_(NVDEV_ENGINE_CE0 , ce[0]); _(NVKM_ENGINE_CE0 , ce[0]);
_(NVDEV_ENGINE_CE1 , ce[1]); _(NVKM_ENGINE_CE1 , ce[1]);
_(NVDEV_ENGINE_CE2 , ce[2]); _(NVKM_ENGINE_CE2 , ce[2]);
_(NVDEV_ENGINE_CIPHER , cipher); _(NVKM_ENGINE_CIPHER , cipher);
_(NVDEV_ENGINE_DISP , disp); _(NVKM_ENGINE_DISP , disp);
_(NVDEV_ENGINE_DMAOBJ , dma); _(NVKM_ENGINE_DMAOBJ , dma);
_(NVDEV_ENGINE_FIFO , fifo); _(NVKM_ENGINE_FIFO , fifo);
_(NVDEV_ENGINE_GR , gr); _(NVKM_ENGINE_GR , gr);
_(NVDEV_ENGINE_IFB , ifb); _(NVKM_ENGINE_IFB , ifb);
_(NVDEV_ENGINE_ME , me); _(NVKM_ENGINE_ME , me);
_(NVDEV_ENGINE_MPEG , mpeg); _(NVKM_ENGINE_MPEG , mpeg);
_(NVDEV_ENGINE_MSENC , msenc); _(NVKM_ENGINE_MSENC , msenc);
_(NVDEV_ENGINE_MSPDEC , mspdec); _(NVKM_ENGINE_MSPDEC , mspdec);
_(NVDEV_ENGINE_MSPPP , msppp); _(NVKM_ENGINE_MSPPP , msppp);
_(NVDEV_ENGINE_MSVLD , msvld); _(NVKM_ENGINE_MSVLD , msvld);
_(NVDEV_ENGINE_PM , pm); _(NVKM_ENGINE_PM , pm);
_(NVDEV_ENGINE_SEC , sec); _(NVKM_ENGINE_SEC , sec);
_(NVDEV_ENGINE_SW , sw); _(NVKM_ENGINE_SW , sw);
_(NVDEV_ENGINE_VIC , vic); _(NVKM_ENGINE_VIC , vic);
_(NVDEV_ENGINE_VP , vp); _(NVKM_ENGINE_VP , vp);
default: default:
WARN_ON(1); WARN_ON(1);
continue; continue;
......
drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c deleted 100644 → 0
View file @ 7624fc01
/*
* Copyright 2012 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include "priv.h"
int
gf100_identify(struct nvkm_device *device)
{
switch (device->chipset) {
case 0xc0:
break;
case 0xc4:
break;
case 0xc3:
break;
case 0xce:
break;
case 0xcf:
break;
case 0xc1:
break;
case 0xc8:
break;
case 0xd9:
break;
case 0xd7:
break;
default:
return -EINVAL;
}
return 0;
}
drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c deleted 100644 → 0
View file @ 7624fc01
/*
* Copyright 2012 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include "priv.h"
int
gk104_identify(struct nvkm_device *device)
{
switch (device->chipset) {
case 0xe4:
break;
case 0xe7:
break;
case 0xe6:
break;
case 0xea:
break;
case 0xf0:
break;
case 0xf1:
break;
case 0x106:
break;
case 0x108:
break;
default:
return -EINVAL;
}
return 0;
}
drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c deleted 100644 → 0
View file @ 7624fc01
/*
* Copyright 2012 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include "priv.h"
int
gm100_identify(struct nvkm_device *device)
{
switch (device->chipset) {
case 0x117:
#if 0
#endif
#if 0
#endif
#if 0
#endif
break;
case 0x124:
#if 0
/* looks to be some non-trivial changes */
/* priv ring says no to 0x10eb14 writes */
#endif
#if 0
#endif
#if 0
#endif
break;
case 0x126:
#if 0
/* looks to be some non-trivial changes */
/* priv ring says no to 0x10eb14 writes */
#endif
#if 0
#endif
#if 0
#endif
break;
case 0x12b:
break;
default:
return -EINVAL;
}
return 0;
}
drivers/gpu/drm/nouveau/nvkm/engine/device/nv04.c deleted 100644 → 0
View file @ 7624fc01
/*
* Copyright 2012 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include "priv.h"
int
nv04_identify(struct nvkm_device *device)
{
switch (device->chipset) {
case 0x04:
break;
case 0x05:
break;
default:
return -EINVAL;
}
return 0;
}
drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c deleted 100644 → 0
View file @ 7624fc01
/*
* Copyright 2012 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include "priv.h"
int
nv10_identify(struct nvkm_device *device)
{
switch (device->chipset) {
case 0x10:
break;
case 0x15:
break;
case 0x16:
break;
case 0x1a:
break;
case 0x11:
break;
case 0x17:
break;
case 0x1f:
break;
case 0x18:
break;
default:
return -EINVAL;
}
return 0;
}
drivers/gpu/drm/nouveau/nvkm/engine/device/nv20.c deleted 100644 → 0
View file @ 7624fc01
/*
* Copyright 2012 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include "priv.h"
int
nv20_identify(struct nvkm_device *device)
{
switch (device->chipset) {
case 0x20:
break;
case 0x25:
break;
case 0x28:
break;
case 0x2a:
break;
default:
return -EINVAL;
}
return 0;
}
drivers/gpu/drm/nouveau/nvkm/engine/device/nv30.c deleted 100644 → 0
View file @ 7624fc01
/*
* Copyright 2012 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include "priv.h"
int
nv30_identify(struct nvkm_device *device)
{
switch (device->chipset) {
case 0x30:
break;
case 0x35:
break;
case 0x31:
break;
case 0x36:
break;
case 0x34:
break;
default:
return -EINVAL;
}
return 0;
}
drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c deleted 100644 → 0
View file @ 7624fc01
/*
* Copyright 2012 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include "priv.h"
int
nv40_identify(struct nvkm_device *device)
{
switch (device->chipset) {
case 0x40:
break;
case 0x41:
break;
case 0x42:
break;
case 0x43:
break;
case 0x45:
break;
case 0x47:
break;
case 0x49:
break;
case 0x4b:
break;
case 0x44:
break;
case 0x46:
break;
case 0x4a:
break;
case 0x4c:
break;
case 0x4e:
break;
case 0x63:
break;
case 0x67:
break;
case 0x68:
break;
default:
return -EINVAL;
}
return 0;
}
drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c deleted 100644 → 0
View file @ 7624fc01
/*
* Copyright 2012 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include "priv.h"
int
nv50_identify(struct nvkm_device *device)
{
switch (device->chipset) {
case 0x50:
break;
case 0x84:
break;
case 0x86:
break;
case 0x92:
break;
case 0x94:
break;
case 0x96:
break;
case 0x98:
break;
case 0xa0:
break;
case 0xaa:
break;
case 0xac:
break;
case 0xa3:
break;
case 0xa5:
break;
case 0xa8:
break;
case 0xaf:
break;
default:
return -EINVAL;
}
return 0;
}
drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
View file @ 68f3f702
...@@ -46,14 +46,4 @@ int nvkm_device_ctor(const struct nvkm_device_func *, ...@@ -46,14 +46,4 @@ int nvkm_device_ctor(const struct nvkm_device_func *,
struct nvkm_device *); struct nvkm_device *);
int nvkm_device_init(struct nvkm_device *); int nvkm_device_init(struct nvkm_device *);
int nvkm_device_fini(struct nvkm_device *, bool suspend); int nvkm_device_fini(struct nvkm_device *, bool suspend);
int nv04_identify(struct nvkm_device *);
int nv10_identify(struct nvkm_device *);
int nv20_identify(struct nvkm_device *);
int nv30_identify(struct nvkm_device *);
int nv40_identify(struct nvkm_device *);
int nv50_identify(struct nvkm_device *);
int gf100_identify(struct nvkm_device *);
int gk104_identify(struct nvkm_device *);
int gm100_identify(struct nvkm_device *);
#endif #endif
drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
View file @ 68f3f702
...@@ -261,10 +261,10 @@ nvkm_udevice_child_get(struct nvkm_object *object, int index, ...@@ -261,10 +261,10 @@ nvkm_udevice_child_get(struct nvkm_object *object, int index,
struct nvkm_udevice *udev = nvkm_udevice(object); struct nvkm_udevice *udev = nvkm_udevice(object);
struct nvkm_device *device = udev->device; struct nvkm_device *device = udev->device;
struct nvkm_engine *engine; struct nvkm_engine *engine;
u64 mask = (1ULL << NVDEV_ENGINE_DMAOBJ) | u64 mask = (1ULL << NVKM_ENGINE_DMAOBJ) |
(1ULL << NVDEV_ENGINE_FIFO) | (1ULL << NVKM_ENGINE_FIFO) |
(1ULL << NVDEV_ENGINE_DISP) | (1ULL << NVKM_ENGINE_DISP) |
(1ULL << NVDEV_ENGINE_PM); (1ULL << NVKM_ENGINE_PM);
const struct nvkm_device_oclass *sclass = NULL; const struct nvkm_device_oclass *sclass = NULL;
int i; int i;
......
drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c
View file @ 68f3f702
...@@ -90,7 +90,7 @@ nv50_disp_dmac_child_get_(struct nv50_disp_chan *base, int index, ...@@ -90,7 +90,7 @@ nv50_disp_dmac_child_get_(struct nv50_disp_chan *base, int index,
struct nvkm_device *device = disp->base.engine.subdev.device; struct nvkm_device *device = disp->base.engine.subdev.device;
const struct nvkm_device_oclass *oclass = NULL; const struct nvkm_device_oclass *oclass = NULL;
sclass->engine = nvkm_device_engine(device, NVDEV_ENGINE_DMAOBJ); sclass->engine = nvkm_device_engine(device, NVKM_ENGINE_DMAOBJ);
if (sclass->engine && sclass->engine->func->base.sclass) { if (sclass->engine && sclass->engine->func->base.sclass) {
sclass->engine->func->base.sclass(sclass, index, &oclass); sclass->engine->func->base.sclass(sclass, index, &oclass);
if (oclass) { if (oclass) {
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
View file @ 68f3f702
...@@ -332,7 +332,7 @@ nvkm_fifo_chan_dtor(struct nvkm_object *object) ...@@ -332,7 +332,7 @@ nvkm_fifo_chan_dtor(struct nvkm_object *object)
return data; return data;
} }
const struct nvkm_object_func static const struct nvkm_object_func
nvkm_fifo_chan_func = { nvkm_fifo_chan_func = {
.dtor = nvkm_fifo_chan_dtor, .dtor = nvkm_fifo_chan_dtor,
.init = nvkm_fifo_chan_init, .init = nvkm_fifo_chan_init,
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c
View file @ 68f3f702
...@@ -48,16 +48,16 @@ static int ...@@ -48,16 +48,16 @@ static int
g84_fifo_chan_engine(struct nvkm_engine *engine) g84_fifo_chan_engine(struct nvkm_engine *engine)
{ {
switch (engine->subdev.index) { switch (engine->subdev.index) {
case NVDEV_ENGINE_GR : return 0; case NVKM_ENGINE_GR : return 0;
case NVDEV_ENGINE_MPEG : case NVKM_ENGINE_MPEG :
case NVDEV_ENGINE_MSPPP : return 1; case NVKM_ENGINE_MSPPP : return 1;
case NVDEV_ENGINE_CE0 : return 2; case NVKM_ENGINE_CE0 : return 2;
case NVDEV_ENGINE_VP : case NVKM_ENGINE_VP :
case NVDEV_ENGINE_MSPDEC: return 3; case NVKM_ENGINE_MSPDEC: return 3;
case NVDEV_ENGINE_CIPHER: case NVKM_ENGINE_CIPHER:
case NVDEV_ENGINE_SEC : return 4; case NVKM_ENGINE_SEC : return 4;
case NVDEV_ENGINE_BSP : case NVKM_ENGINE_BSP :
case NVDEV_ENGINE_MSVLD : return 5; case NVKM_ENGINE_MSVLD : return 5;
default: default:
WARN_ON(1); WARN_ON(1);
return 0; return 0;
...@@ -68,18 +68,18 @@ static int ...@@ -68,18 +68,18 @@ static int
g84_fifo_chan_engine_addr(struct nvkm_engine *engine) g84_fifo_chan_engine_addr(struct nvkm_engine *engine)
{ {
switch (engine->subdev.index) { switch (engine->subdev.index) {
case NVDEV_ENGINE_DMAOBJ: case NVKM_ENGINE_DMAOBJ:
case NVDEV_ENGINE_SW : return -1; case NVKM_ENGINE_SW : return -1;
case NVDEV_ENGINE_GR : return 0x0020; case NVKM_ENGINE_GR : return 0x0020;
case NVDEV_ENGINE_VP : case NVKM_ENGINE_VP :
case NVDEV_ENGINE_MSPDEC: return 0x0040; case NVKM_ENGINE_MSPDEC: return 0x0040;
case NVDEV_ENGINE_MPEG : case NVKM_ENGINE_MPEG :
case NVDEV_ENGINE_MSPPP : return 0x0060; case NVKM_ENGINE_MSPPP : return 0x0060;
case NVDEV_ENGINE_BSP : case NVKM_ENGINE_BSP :
case NVDEV_ENGINE_MSVLD : return 0x0080; case NVKM_ENGINE_MSVLD : return 0x0080;
case NVDEV_ENGINE_CIPHER: case NVKM_ENGINE_CIPHER:
case NVDEV_ENGINE_SEC : return 0x00a0; case NVKM_ENGINE_SEC : return 0x00a0;
case NVDEV_ENGINE_CE0 : return 0x00c0; case NVKM_ENGINE_CE0 : return 0x00c0;
default: default:
WARN_ON(1); WARN_ON(1);
return -1; return -1;
...@@ -167,11 +167,6 @@ g84_fifo_chan_engine_ctor(struct nvkm_fifo_chan *base, ...@@ -167,11 +167,6 @@ g84_fifo_chan_engine_ctor(struct nvkm_fifo_chan *base,
if (g84_fifo_chan_engine_addr(engine) < 0) if (g84_fifo_chan_engine_addr(engine) < 0)
return 0; return 0;
if (nv_iclass(object, NV_GPUOBJ_CLASS)) {
chan->engn[engn] = nv_gpuobj(object);
return 0;
}
return nvkm_object_bind(object, NULL, 0, &chan->engn[engn]); return nvkm_object_bind(object, NULL, 0, &chan->engn[engn]);
} }
...@@ -184,20 +179,20 @@ g84_fifo_chan_object_ctor(struct nvkm_fifo_chan *base, ...@@ -184,20 +179,20 @@ g84_fifo_chan_object_ctor(struct nvkm_fifo_chan *base,
u32 context; u32 context;
switch (object->engine->subdev.index) { switch (object->engine->subdev.index) {
case NVDEV_ENGINE_DMAOBJ: case NVKM_ENGINE_DMAOBJ:
case NVDEV_ENGINE_SW : context = 0x00000000; break; case NVKM_ENGINE_SW : context = 0x00000000; break;
case NVDEV_ENGINE_GR : context = 0x00100000; break; case NVKM_ENGINE_GR : context = 0x00100000; break;
case NVDEV_ENGINE_MPEG : case NVKM_ENGINE_MPEG :
case NVDEV_ENGINE_MSPPP : context = 0x00200000; break; case NVKM_ENGINE_MSPPP : context = 0x00200000; break;
case NVDEV_ENGINE_ME : case NVKM_ENGINE_ME :
case NVDEV_ENGINE_CE0 : context = 0x00300000; break; case NVKM_ENGINE_CE0 : context = 0x00300000; break;
case NVDEV_ENGINE_VP : case NVKM_ENGINE_VP :
case NVDEV_ENGINE_MSPDEC: context = 0x00400000; break; case NVKM_ENGINE_MSPDEC: context = 0x00400000; break;
case NVDEV_ENGINE_CIPHER: case NVKM_ENGINE_CIPHER:
case NVDEV_ENGINE_SEC : case NVKM_ENGINE_SEC :
case NVDEV_ENGINE_VIC : context = 0x00500000; break; case NVKM_ENGINE_VIC : context = 0x00500000; break;
case NVDEV_ENGINE_BSP : case NVKM_ENGINE_BSP :
case NVDEV_ENGINE_MSVLD : context = 0x00600000; break; case NVKM_ENGINE_MSVLD : context = 0x00600000; break;
default: default:
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
...@@ -243,20 +238,20 @@ g84_fifo_chan_ctor(struct nv50_fifo *fifo, u64 vm, u64 push, ...@@ -243,20 +238,20 @@ g84_fifo_chan_ctor(struct nv50_fifo *fifo, u64 vm, u64 push,
ret = nvkm_fifo_chan_ctor(&g84_fifo_chan_func, &fifo->base, ret = nvkm_fifo_chan_ctor(&g84_fifo_chan_func, &fifo->base,
0x10000, 0x1000, false, vm, push, 0x10000, 0x1000, false, vm, push,
(1ULL << NVDEV_ENGINE_BSP) | (1ULL << NVKM_ENGINE_BSP) |
(1ULL << NVDEV_ENGINE_CE0) | (1ULL << NVKM_ENGINE_CE0) |
(1ULL << NVDEV_ENGINE_CIPHER) | (1ULL << NVKM_ENGINE_CIPHER) |
(1ULL << NVDEV_ENGINE_DMAOBJ) | (1ULL << NVKM_ENGINE_DMAOBJ) |
(1ULL << NVDEV_ENGINE_GR) | (1ULL << NVKM_ENGINE_GR) |
(1ULL << NVDEV_ENGINE_ME) | (1ULL << NVKM_ENGINE_ME) |
(1ULL << NVDEV_ENGINE_MPEG) | (1ULL << NVKM_ENGINE_MPEG) |
(1ULL << NVDEV_ENGINE_MSPDEC) | (1ULL << NVKM_ENGINE_MSPDEC) |
(1ULL << NVDEV_ENGINE_MSPPP) | (1ULL << NVKM_ENGINE_MSPPP) |
(1ULL << NVDEV_ENGINE_MSVLD) | (1ULL << NVKM_ENGINE_MSVLD) |
(1ULL << NVDEV_ENGINE_SEC) | (1ULL << NVKM_ENGINE_SEC) |
(1ULL << NVDEV_ENGINE_SW) | (1ULL << NVKM_ENGINE_SW) |
(1ULL << NVDEV_ENGINE_VIC) | (1ULL << NVKM_ENGINE_VIC) |
(1ULL << NVDEV_ENGINE_VP), (1ULL << NVKM_ENGINE_VP),
0, 0xc00000, 0x2000, oclass, &chan->base); 0, 0xc00000, 0x2000, oclass, &chan->base);
chan->fifo = fifo; chan->fifo = fifo;
if (ret) if (ret)
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h
View file @ 68f3f702
...@@ -17,7 +17,7 @@ struct gf100_fifo_chan { ...@@ -17,7 +17,7 @@ struct gf100_fifo_chan {
struct { struct {
struct nvkm_gpuobj *inst; struct nvkm_gpuobj *inst;
struct nvkm_vma vma; struct nvkm_vma vma;
} engn[NVDEV_SUBDEV_NR]; } engn[NVKM_SUBDEV_NR];
}; };
extern const struct nvkm_fifo_chan_oclass gf100_fifo_gpfifo_oclass; extern const struct nvkm_fifo_chan_oclass gf100_fifo_gpfifo_oclass;
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h
View file @ 68f3f702
...@@ -18,7 +18,7 @@ struct gk104_fifo_chan { ...@@ -18,7 +18,7 @@ struct gk104_fifo_chan {
struct { struct {
struct nvkm_gpuobj *inst; struct nvkm_gpuobj *inst;
struct nvkm_vma vma; struct nvkm_vma vma;
} engn[NVDEV_SUBDEV_NR]; } engn[NVKM_SUBDEV_NR];
}; };
int gk104_fifo_gpfifo_new(struct nvkm_fifo *, const struct nvkm_oclass *, int gk104_fifo_gpfifo_new(struct nvkm_fifo *, const struct nvkm_oclass *,
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv04.h
View file @ 68f3f702
...@@ -8,7 +8,7 @@ struct nv04_fifo_chan { ...@@ -8,7 +8,7 @@ struct nv04_fifo_chan {
struct nvkm_fifo_chan base; struct nvkm_fifo_chan base;
struct nv04_fifo *fifo; struct nv04_fifo *fifo;
u32 ramfc; u32 ramfc;
struct nvkm_gpuobj *engn[NVDEV_SUBDEV_NR]; struct nvkm_gpuobj *engn[NVKM_SUBDEV_NR];
}; };
extern const struct nvkm_fifo_chan_func nv04_fifo_dma_func; extern const struct nvkm_fifo_chan_func nv04_fifo_dma_func;
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.c
View file @ 68f3f702
...@@ -32,10 +32,10 @@ static int ...@@ -32,10 +32,10 @@ static int
nv50_fifo_chan_engine_addr(struct nvkm_engine *engine) nv50_fifo_chan_engine_addr(struct nvkm_engine *engine)
{ {
switch (engine->subdev.index) { switch (engine->subdev.index) {
case NVDEV_ENGINE_DMAOBJ: case NVKM_ENGINE_DMAOBJ:
case NVDEV_ENGINE_SW : return -1; case NVKM_ENGINE_SW : return -1;
case NVDEV_ENGINE_GR : return 0x0000; case NVKM_ENGINE_GR : return 0x0000;
case NVDEV_ENGINE_MPEG : return 0x0060; case NVKM_ENGINE_MPEG : return 0x0060;
default: default:
WARN_ON(1); WARN_ON(1);
return -1; return -1;
...@@ -130,11 +130,6 @@ nv50_fifo_chan_engine_dtor(struct nvkm_fifo_chan *base, ...@@ -130,11 +130,6 @@ nv50_fifo_chan_engine_dtor(struct nvkm_fifo_chan *base,
struct nvkm_engine *engine) struct nvkm_engine *engine)
{ {
struct nv50_fifo_chan *chan = nv50_fifo_chan(base); struct nv50_fifo_chan *chan = nv50_fifo_chan(base);
if (!chan->engn[engine->subdev.index] ||
chan->engn[engine->subdev.index]->object.oclass) {
chan->engn[engine->subdev.index] = NULL;
return;
}
nvkm_gpuobj_del(&chan->engn[engine->subdev.index]); nvkm_gpuobj_del(&chan->engn[engine->subdev.index]);
} }
...@@ -149,11 +144,6 @@ nv50_fifo_chan_engine_ctor(struct nvkm_fifo_chan *base, ...@@ -149,11 +144,6 @@ nv50_fifo_chan_engine_ctor(struct nvkm_fifo_chan *base,
if (nv50_fifo_chan_engine_addr(engine) < 0) if (nv50_fifo_chan_engine_addr(engine) < 0)
return 0; return 0;
if (nv_iclass(object, NV_GPUOBJ_CLASS)) {
chan->engn[engn] = nv_gpuobj(object);
return 0;
}
return nvkm_object_bind(object, NULL, 0, &chan->engn[engn]); return nvkm_object_bind(object, NULL, 0, &chan->engn[engn]);
} }
...@@ -173,10 +163,10 @@ nv50_fifo_chan_object_ctor(struct nvkm_fifo_chan *base, ...@@ -173,10 +163,10 @@ nv50_fifo_chan_object_ctor(struct nvkm_fifo_chan *base,
u32 context; u32 context;
switch (object->engine->subdev.index) { switch (object->engine->subdev.index) {
case NVDEV_ENGINE_DMAOBJ: case NVKM_ENGINE_DMAOBJ:
case NVDEV_ENGINE_SW : context = 0x00000000; break; case NVKM_ENGINE_SW : context = 0x00000000; break;
case NVDEV_ENGINE_GR : context = 0x00100000; break; case NVKM_ENGINE_GR : context = 0x00100000; break;
case NVDEV_ENGINE_MPEG : context = 0x00200000; break; case NVKM_ENGINE_MPEG : context = 0x00200000; break;
default: default:
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
...@@ -248,10 +238,10 @@ nv50_fifo_chan_ctor(struct nv50_fifo *fifo, u64 vm, u64 push, ...@@ -248,10 +238,10 @@ nv50_fifo_chan_ctor(struct nv50_fifo *fifo, u64 vm, u64 push,
ret = nvkm_fifo_chan_ctor(&nv50_fifo_chan_func, &fifo->base, ret = nvkm_fifo_chan_ctor(&nv50_fifo_chan_func, &fifo->base,
0x10000, 0x1000, false, vm, push, 0x10000, 0x1000, false, vm, push,
(1ULL << NVDEV_ENGINE_DMAOBJ) | (1ULL << NVKM_ENGINE_DMAOBJ) |
(1ULL << NVDEV_ENGINE_SW) | (1ULL << NVKM_ENGINE_SW) |
(1ULL << NVDEV_ENGINE_GR) | (1ULL << NVKM_ENGINE_GR) |
(1ULL << NVDEV_ENGINE_MPEG), (1ULL << NVKM_ENGINE_MPEG),
0, 0xc00000, 0x2000, oclass, &chan->base); 0, 0xc00000, 0x2000, oclass, &chan->base);
chan->fifo = fifo; chan->fifo = fifo;
if (ret) if (ret)
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h
View file @ 68f3f702
...@@ -15,7 +15,7 @@ struct nv50_fifo_chan { ...@@ -15,7 +15,7 @@ struct nv50_fifo_chan {
struct nvkm_ramht *ramht; struct nvkm_ramht *ramht;
struct nvkm_vm *vm; struct nvkm_vm *vm;
struct nvkm_gpuobj *engn[NVDEV_SUBDEV_NR]; struct nvkm_gpuobj *engn[NVKM_SUBDEV_NR];
}; };
int nv50_fifo_chan_ctor(struct nv50_fifo *, u64 vm, u64 push, int nv50_fifo_chan_ctor(struct nv50_fifo *, u64 vm, u64 push,
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c
View file @ 68f3f702
...@@ -50,10 +50,10 @@ nv04_fifo_dma_object_ctor(struct nvkm_fifo_chan *base, ...@@ -50,10 +50,10 @@ nv04_fifo_dma_object_ctor(struct nvkm_fifo_chan *base,
int hash; int hash;
switch (object->engine->subdev.index) { switch (object->engine->subdev.index) {
case NVDEV_ENGINE_DMAOBJ: case NVKM_ENGINE_DMAOBJ:
case NVDEV_ENGINE_SW : context |= 0x00000000; break; case NVKM_ENGINE_SW : context |= 0x00000000; break;
case NVDEV_ENGINE_GR : context |= 0x00010000; break; case NVKM_ENGINE_GR : context |= 0x00010000; break;
case NVDEV_ENGINE_MPEG : context |= 0x00020000; break; case NVKM_ENGINE_MPEG : context |= 0x00020000; break;
default: default:
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
...@@ -185,9 +185,9 @@ nv04_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass, ...@@ -185,9 +185,9 @@ nv04_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
ret = nvkm_fifo_chan_ctor(&nv04_fifo_dma_func, &fifo->base, ret = nvkm_fifo_chan_ctor(&nv04_fifo_dma_func, &fifo->base,
0x1000, 0x1000, false, 0, args->v0.pushbuf, 0x1000, 0x1000, false, 0, args->v0.pushbuf,
(1ULL << NVDEV_ENGINE_DMAOBJ) | (1ULL << NVKM_ENGINE_DMAOBJ) |
(1ULL << NVDEV_ENGINE_GR) | (1ULL << NVKM_ENGINE_GR) |
(1ULL << NVDEV_ENGINE_SW), (1ULL << NVKM_ENGINE_SW),
0, 0x800000, 0x10000, oclass, &chan->base); 0, 0x800000, 0x10000, oclass, &chan->base);
chan->fifo = fifo; chan->fifo = fifo;
if (ret) if (ret)
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv10.c
View file @ 68f3f702
...@@ -61,9 +61,9 @@ nv10_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass, ...@@ -61,9 +61,9 @@ nv10_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
ret = nvkm_fifo_chan_ctor(&nv04_fifo_dma_func, &fifo->base, ret = nvkm_fifo_chan_ctor(&nv04_fifo_dma_func, &fifo->base,
0x1000, 0x1000, false, 0, args->v0.pushbuf, 0x1000, 0x1000, false, 0, args->v0.pushbuf,
(1ULL << NVDEV_ENGINE_DMAOBJ) | (1ULL << NVKM_ENGINE_DMAOBJ) |
(1ULL << NVDEV_ENGINE_GR) | (1ULL << NVKM_ENGINE_GR) |
(1ULL << NVDEV_ENGINE_SW), (1ULL << NVKM_ENGINE_SW),
0, 0x800000, 0x10000, oclass, &chan->base); 0, 0x800000, 0x10000, oclass, &chan->base);
chan->fifo = fifo; chan->fifo = fifo;
if (ret) if (ret)
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv17.c
View file @ 68f3f702
...@@ -61,10 +61,10 @@ nv17_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass, ...@@ -61,10 +61,10 @@ nv17_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
ret = nvkm_fifo_chan_ctor(&nv04_fifo_dma_func, &fifo->base, ret = nvkm_fifo_chan_ctor(&nv04_fifo_dma_func, &fifo->base,
0x1000, 0x1000, false, 0, args->v0.pushbuf, 0x1000, 0x1000, false, 0, args->v0.pushbuf,
(1ULL << NVDEV_ENGINE_DMAOBJ) | (1ULL << NVKM_ENGINE_DMAOBJ) |
(1ULL << NVDEV_ENGINE_GR) | (1ULL << NVKM_ENGINE_GR) |
(1ULL << NVDEV_ENGINE_MPEG) | /* NV31- */ (1ULL << NVKM_ENGINE_MPEG) | /* NV31- */
(1ULL << NVDEV_ENGINE_SW), (1ULL << NVKM_ENGINE_SW),
0, 0x800000, 0x10000, oclass, &chan->base); 0, 0x800000, 0x10000, oclass, &chan->base);
chan->fifo = fifo; chan->fifo = fifo;
if (ret) if (ret)
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv40.c
View file @ 68f3f702
...@@ -35,14 +35,14 @@ static bool ...@@ -35,14 +35,14 @@ static bool
nv40_fifo_dma_engine(struct nvkm_engine *engine, u32 *reg, u32 *ctx) nv40_fifo_dma_engine(struct nvkm_engine *engine, u32 *reg, u32 *ctx)
{ {
switch (engine->subdev.index) { switch (engine->subdev.index) {
case NVDEV_ENGINE_DMAOBJ: case NVKM_ENGINE_DMAOBJ:
case NVDEV_ENGINE_SW: case NVKM_ENGINE_SW:
return false; return false;
case NVDEV_ENGINE_GR: case NVKM_ENGINE_GR:
*reg = 0x0032e0; *reg = 0x0032e0;
*ctx = 0x38; *ctx = 0x38;
return true; return true;
case NVDEV_ENGINE_MPEG: case NVKM_ENGINE_MPEG:
*reg = 0x00330c; *reg = 0x00330c;
*ctx = 0x54; *ctx = 0x54;
return true; return true;
...@@ -118,11 +118,6 @@ nv40_fifo_dma_engine_dtor(struct nvkm_fifo_chan *base, ...@@ -118,11 +118,6 @@ nv40_fifo_dma_engine_dtor(struct nvkm_fifo_chan *base,
struct nvkm_engine *engine) struct nvkm_engine *engine)
{ {
struct nv04_fifo_chan *chan = nv04_fifo_chan(base); struct nv04_fifo_chan *chan = nv04_fifo_chan(base);
if (!chan->engn[engine->subdev.index] ||
chan->engn[engine->subdev.index]->object.oclass) {
chan->engn[engine->subdev.index] = NULL;
return;
}
nvkm_gpuobj_del(&chan->engn[engine->subdev.index]); nvkm_gpuobj_del(&chan->engn[engine->subdev.index]);
} }
...@@ -138,11 +133,6 @@ nv40_fifo_dma_engine_ctor(struct nvkm_fifo_chan *base, ...@@ -138,11 +133,6 @@ nv40_fifo_dma_engine_ctor(struct nvkm_fifo_chan *base,
if (!nv40_fifo_dma_engine(engine, &reg, &ctx)) if (!nv40_fifo_dma_engine(engine, &reg, &ctx))
return 0; return 0;
if (nv_iclass(object, NV_GPUOBJ_CLASS)) {
chan->engn[engn] = nv_gpuobj(object);
return 0;
}
return nvkm_object_bind(object, NULL, 0, &chan->engn[engn]); return nvkm_object_bind(object, NULL, 0, &chan->engn[engn]);
} }
...@@ -157,10 +147,10 @@ nv40_fifo_dma_object_ctor(struct nvkm_fifo_chan *base, ...@@ -157,10 +147,10 @@ nv40_fifo_dma_object_ctor(struct nvkm_fifo_chan *base,
int hash; int hash;
switch (object->engine->subdev.index) { switch (object->engine->subdev.index) {
case NVDEV_ENGINE_DMAOBJ: case NVKM_ENGINE_DMAOBJ:
case NVDEV_ENGINE_SW : context |= 0x00000000; break; case NVKM_ENGINE_SW : context |= 0x00000000; break;
case NVDEV_ENGINE_GR : context |= 0x00100000; break; case NVKM_ENGINE_GR : context |= 0x00100000; break;
case NVDEV_ENGINE_MPEG : context |= 0x00200000; break; case NVKM_ENGINE_MPEG : context |= 0x00200000; break;
default: default:
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
...@@ -216,10 +206,10 @@ nv40_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass, ...@@ -216,10 +206,10 @@ nv40_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
ret = nvkm_fifo_chan_ctor(&nv40_fifo_dma_func, &fifo->base, ret = nvkm_fifo_chan_ctor(&nv40_fifo_dma_func, &fifo->base,
0x1000, 0x1000, false, 0, args->v0.pushbuf, 0x1000, 0x1000, false, 0, args->v0.pushbuf,
(1ULL << NVDEV_ENGINE_DMAOBJ) | (1ULL << NVKM_ENGINE_DMAOBJ) |
(1ULL << NVDEV_ENGINE_GR) | (1ULL << NVKM_ENGINE_GR) |
(1ULL << NVDEV_ENGINE_MPEG) | (1ULL << NVKM_ENGINE_MPEG) |
(1ULL << NVDEV_ENGINE_SW), (1ULL << NVKM_ENGINE_SW),
0, 0xc00000, 0x1000, oclass, &chan->base); 0, 0xc00000, 0x1000, oclass, &chan->base);
chan->fifo = fifo; chan->fifo = fifo;
if (ret) if (ret)
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
View file @ 68f3f702
...@@ -82,12 +82,12 @@ static inline int ...@@ -82,12 +82,12 @@ static inline int
gf100_fifo_engidx(struct gf100_fifo *fifo, u32 engn) gf100_fifo_engidx(struct gf100_fifo *fifo, u32 engn)
{ {
switch (engn) { switch (engn) {
case NVDEV_ENGINE_GR : engn = 0; break; case NVKM_ENGINE_GR : engn = 0; break;
case NVDEV_ENGINE_MSVLD : engn = 1; break; case NVKM_ENGINE_MSVLD : engn = 1; break;
case NVDEV_ENGINE_MSPPP : engn = 2; break; case NVKM_ENGINE_MSPPP : engn = 2; break;
case NVDEV_ENGINE_MSPDEC: engn = 3; break; case NVKM_ENGINE_MSPDEC: engn = 3; break;
case NVDEV_ENGINE_CE0 : engn = 4; break; case NVKM_ENGINE_CE0 : engn = 4; break;
case NVDEV_ENGINE_CE1 : engn = 5; break; case NVKM_ENGINE_CE1 : engn = 5; break;
default: default:
return -1; return -1;
} }
...@@ -101,12 +101,12 @@ gf100_fifo_engine(struct gf100_fifo *fifo, u32 engn) ...@@ -101,12 +101,12 @@ gf100_fifo_engine(struct gf100_fifo *fifo, u32 engn)
struct nvkm_device *device = fifo->base.engine.subdev.device; struct nvkm_device *device = fifo->base.engine.subdev.device;
switch (engn) { switch (engn) {
case 0: engn = NVDEV_ENGINE_GR; break; case 0: engn = NVKM_ENGINE_GR; break;
case 1: engn = NVDEV_ENGINE_MSVLD; break; case 1: engn = NVKM_ENGINE_MSVLD; break;
case 2: engn = NVDEV_ENGINE_MSPPP; break; case 2: engn = NVKM_ENGINE_MSPPP; break;
case 3: engn = NVDEV_ENGINE_MSPDEC; break; case 3: engn = NVKM_ENGINE_MSPDEC; break;
case 4: engn = NVDEV_ENGINE_CE0; break; case 4: engn = NVKM_ENGINE_CE0; break;
case 5: engn = NVDEV_ENGINE_CE1; break; case 5: engn = NVKM_ENGINE_CE1; break;
default: default:
return NULL; return NULL;
} }
...@@ -229,17 +229,17 @@ gf100_fifo_intr_sched(struct gf100_fifo *fifo) ...@@ -229,17 +229,17 @@ gf100_fifo_intr_sched(struct gf100_fifo *fifo)
static const struct nvkm_enum static const struct nvkm_enum
gf100_fifo_fault_engine[] = { gf100_fifo_fault_engine[] = {
{ 0x00, "PGRAPH", NULL, NVDEV_ENGINE_GR }, { 0x00, "PGRAPH", NULL, NVKM_ENGINE_GR },
{ 0x03, "PEEPHOLE", NULL, NVDEV_ENGINE_IFB }, { 0x03, "PEEPHOLE", NULL, NVKM_ENGINE_IFB },
{ 0x04, "BAR1", NULL, NVDEV_SUBDEV_BAR }, { 0x04, "BAR1", NULL, NVKM_SUBDEV_BAR },
{ 0x05, "BAR3", NULL, NVDEV_SUBDEV_INSTMEM }, { 0x05, "BAR3", NULL, NVKM_SUBDEV_INSTMEM },
{ 0x07, "PFIFO", NULL, NVDEV_ENGINE_FIFO }, { 0x07, "PFIFO", NULL, NVKM_ENGINE_FIFO },
{ 0x10, "PMSVLD", NULL, NVDEV_ENGINE_MSVLD }, { 0x10, "PMSVLD", NULL, NVKM_ENGINE_MSVLD },
{ 0x11, "PMSPPP", NULL, NVDEV_ENGINE_MSPPP }, { 0x11, "PMSPPP", NULL, NVKM_ENGINE_MSPPP },
{ 0x13, "PCOUNTER" }, { 0x13, "PCOUNTER" },
{ 0x14, "PMSPDEC", NULL, NVDEV_ENGINE_MSPDEC }, { 0x14, "PMSPDEC", NULL, NVKM_ENGINE_MSPDEC },
{ 0x15, "PCE0", NULL, NVDEV_ENGINE_CE0 }, { 0x15, "PCE0", NULL, NVKM_ENGINE_CE0 },
{ 0x16, "PCE1", NULL, NVDEV_ENGINE_CE1 }, { 0x16, "PCE1", NULL, NVKM_ENGINE_CE1 },
{ 0x17, "PDAEMON" }, { 0x17, "PDAEMON" },
{} {}
}; };
...@@ -317,13 +317,13 @@ gf100_fifo_intr_fault(struct gf100_fifo *fifo, int unit) ...@@ -317,13 +317,13 @@ gf100_fifo_intr_fault(struct gf100_fifo *fifo, int unit)
if (eu) { if (eu) {
switch (eu->data2) { switch (eu->data2) {
case NVDEV_SUBDEV_BAR: case NVKM_SUBDEV_BAR:
nvkm_mask(device, 0x001704, 0x00000000, 0x00000000); nvkm_mask(device, 0x001704, 0x00000000, 0x00000000);
break; break;
case NVDEV_SUBDEV_INSTMEM: case NVKM_SUBDEV_INSTMEM:
nvkm_mask(device, 0x001714, 0x00000000, 0x00000000); nvkm_mask(device, 0x001714, 0x00000000, 0x00000000);
break; break;
case NVDEV_ENGINE_IFB: case NVKM_ENGINE_IFB:
nvkm_mask(device, 0x001718, 0x00000000, 0x00000000); nvkm_mask(device, 0x001718, 0x00000000, 0x00000000);
break; break;
default: default:
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
View file @ 68f3f702
...@@ -248,22 +248,22 @@ gk104_fifo_intr_dropped_fault(struct gk104_fifo *fifo) ...@@ -248,22 +248,22 @@ gk104_fifo_intr_dropped_fault(struct gk104_fifo *fifo)
static const struct nvkm_enum static const struct nvkm_enum
gk104_fifo_fault_engine[] = { gk104_fifo_fault_engine[] = {
{ 0x00, "GR", NULL, NVDEV_ENGINE_GR }, { 0x00, "GR", NULL, NVKM_ENGINE_GR },
{ 0x03, "IFB", NULL, NVDEV_ENGINE_IFB }, { 0x03, "IFB", NULL, NVKM_ENGINE_IFB },
{ 0x04, "BAR1", NULL, NVDEV_SUBDEV_BAR }, { 0x04, "BAR1", NULL, NVKM_SUBDEV_BAR },
{ 0x05, "BAR3", NULL, NVDEV_SUBDEV_INSTMEM }, { 0x05, "BAR3", NULL, NVKM_SUBDEV_INSTMEM },
{ 0x07, "PBDMA0", NULL, NVDEV_ENGINE_FIFO }, { 0x07, "PBDMA0", NULL, NVKM_ENGINE_FIFO },
{ 0x08, "PBDMA1", NULL, NVDEV_ENGINE_FIFO }, { 0x08, "PBDMA1", NULL, NVKM_ENGINE_FIFO },
{ 0x09, "PBDMA2", NULL, NVDEV_ENGINE_FIFO }, { 0x09, "PBDMA2", NULL, NVKM_ENGINE_FIFO },
{ 0x10, "MSVLD", NULL, NVDEV_ENGINE_MSVLD }, { 0x10, "MSVLD", NULL, NVKM_ENGINE_MSVLD },
{ 0x11, "MSPPP", NULL, NVDEV_ENGINE_MSPPP }, { 0x11, "MSPPP", NULL, NVKM_ENGINE_MSPPP },
{ 0x13, "PERF" }, { 0x13, "PERF" },
{ 0x14, "MSPDEC", NULL, NVDEV_ENGINE_MSPDEC }, { 0x14, "MSPDEC", NULL, NVKM_ENGINE_MSPDEC },
{ 0x15, "CE0", NULL, NVDEV_ENGINE_CE0 }, { 0x15, "CE0", NULL, NVKM_ENGINE_CE0 },
{ 0x16, "CE1", NULL, NVDEV_ENGINE_CE1 }, { 0x16, "CE1", NULL, NVKM_ENGINE_CE1 },
{ 0x17, "PMU" }, { 0x17, "PMU" },
{ 0x19, "MSENC", NULL, NVDEV_ENGINE_MSENC }, { 0x19, "MSENC", NULL, NVKM_ENGINE_MSENC },
{ 0x1b, "CE2", NULL, NVDEV_ENGINE_CE2 }, { 0x1b, "CE2", NULL, NVKM_ENGINE_CE2 },
{} {}
}; };
...@@ -382,13 +382,13 @@ gk104_fifo_intr_fault(struct gk104_fifo *fifo, int unit) ...@@ -382,13 +382,13 @@ gk104_fifo_intr_fault(struct gk104_fifo *fifo, int unit)
if (eu) { if (eu) {
switch (eu->data2) { switch (eu->data2) {
case NVDEV_SUBDEV_BAR: case NVKM_SUBDEV_BAR:
nvkm_mask(device, 0x001704, 0x00000000, 0x00000000); nvkm_mask(device, 0x001704, 0x00000000, 0x00000000);
break; break;
case NVDEV_SUBDEV_INSTMEM: case NVKM_SUBDEV_INSTMEM:
nvkm_mask(device, 0x001714, 0x00000000, 0x00000000); nvkm_mask(device, 0x001714, 0x00000000, 0x00000000);
break; break;
case NVDEV_ENGINE_IFB: case NVKM_ENGINE_IFB:
nvkm_mask(device, 0x001718, 0x00000000, 0x00000000); nvkm_mask(device, 0x001718, 0x00000000, 0x00000000);
break; break;
default: default:
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
View file @ 68f3f702
...@@ -41,15 +41,15 @@ static inline u64 ...@@ -41,15 +41,15 @@ static inline u64
gk104_fifo_engine_subdev(int engine) gk104_fifo_engine_subdev(int engine)
{ {
switch (engine) { switch (engine) {
case 0: return (1ULL << NVDEV_ENGINE_GR) | case 0: return (1ULL << NVKM_ENGINE_GR) |
(1ULL << NVDEV_ENGINE_SW) | (1ULL << NVKM_ENGINE_SW) |
(1ULL << NVDEV_ENGINE_CE2); (1ULL << NVKM_ENGINE_CE2);
case 1: return (1ULL << NVDEV_ENGINE_MSPDEC); case 1: return (1ULL << NVKM_ENGINE_MSPDEC);
case 2: return (1ULL << NVDEV_ENGINE_MSPPP); case 2: return (1ULL << NVKM_ENGINE_MSPPP);
case 3: return (1ULL << NVDEV_ENGINE_MSVLD); case 3: return (1ULL << NVKM_ENGINE_MSVLD);
case 4: return (1ULL << NVDEV_ENGINE_CE0); case 4: return (1ULL << NVKM_ENGINE_CE0);
case 5: return (1ULL << NVDEV_ENGINE_CE1); case 5: return (1ULL << NVKM_ENGINE_CE1);
case 6: return (1ULL << NVDEV_ENGINE_MSENC); case 6: return (1ULL << NVKM_ENGINE_MSENC);
default: default:
WARN_ON(1); WARN_ON(1);
return 0; return 0;
...@@ -60,15 +60,15 @@ static inline int ...@@ -60,15 +60,15 @@ static inline int
gk104_fifo_subdev_engine(int subdev) gk104_fifo_subdev_engine(int subdev)
{ {
switch (subdev) { switch (subdev) {
case NVDEV_ENGINE_GR: case NVKM_ENGINE_GR:
case NVDEV_ENGINE_SW: case NVKM_ENGINE_SW:
case NVDEV_ENGINE_CE2 : return 0; case NVKM_ENGINE_CE2 : return 0;
case NVDEV_ENGINE_MSPDEC: return 1; case NVKM_ENGINE_MSPDEC: return 1;
case NVDEV_ENGINE_MSPPP : return 2; case NVKM_ENGINE_MSPPP : return 2;
case NVDEV_ENGINE_MSVLD : return 3; case NVKM_ENGINE_MSVLD : return 3;
case NVDEV_ENGINE_CE0 : return 4; case NVKM_ENGINE_CE0 : return 4;
case NVDEV_ENGINE_CE1 : return 5; case NVKM_ENGINE_CE1 : return 5;
case NVDEV_ENGINE_MSENC : return 6; case NVKM_ENGINE_MSENC : return 6;
default: default:
WARN_ON(1); WARN_ON(1);
return 0; return 0;
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c
View file @ 68f3f702
...@@ -35,13 +35,13 @@ static u32 ...@@ -35,13 +35,13 @@ static u32
gf100_fifo_gpfifo_engine_addr(struct nvkm_engine *engine) gf100_fifo_gpfifo_engine_addr(struct nvkm_engine *engine)
{ {
switch (engine->subdev.index) { switch (engine->subdev.index) {
case NVDEV_ENGINE_SW : return 0; case NVKM_ENGINE_SW : return 0;
case NVDEV_ENGINE_GR : return 0x0210; case NVKM_ENGINE_GR : return 0x0210;
case NVDEV_ENGINE_CE0 : return 0x0230; case NVKM_ENGINE_CE0 : return 0x0230;
case NVDEV_ENGINE_CE1 : return 0x0240; case NVKM_ENGINE_CE1 : return 0x0240;
case NVDEV_ENGINE_MSPDEC: return 0x0250; case NVKM_ENGINE_MSPDEC: return 0x0250;
case NVDEV_ENGINE_MSPPP : return 0x0260; case NVKM_ENGINE_MSPPP : return 0x0260;
case NVDEV_ENGINE_MSVLD : return 0x0270; case NVKM_ENGINE_MSVLD : return 0x0270;
default: default:
WARN_ON(1); WARN_ON(1);
return 0; return 0;
...@@ -121,12 +121,6 @@ gf100_fifo_gpfifo_engine_ctor(struct nvkm_fifo_chan *base, ...@@ -121,12 +121,6 @@ gf100_fifo_gpfifo_engine_ctor(struct nvkm_fifo_chan *base,
if (!gf100_fifo_gpfifo_engine_addr(engine)) if (!gf100_fifo_gpfifo_engine_addr(engine))
return 0; return 0;
if (object->oclass) {
return nvkm_gpuobj_map(nv_gpuobj(object), chan->vm,
NV_MEM_ACCESS_RW,
&chan->engn[engn].vma);
}
ret = nvkm_object_bind(object, NULL, 0, &chan->engn[engn].inst); ret = nvkm_object_bind(object, NULL, 0, &chan->engn[engn].inst);
if (ret) if (ret)
return ret; return ret;
...@@ -225,13 +219,13 @@ gf100_fifo_gpfifo_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass, ...@@ -225,13 +219,13 @@ gf100_fifo_gpfifo_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
ret = nvkm_fifo_chan_ctor(&gf100_fifo_gpfifo_func, &fifo->base, ret = nvkm_fifo_chan_ctor(&gf100_fifo_gpfifo_func, &fifo->base,
0x1000, 0x1000, true, args->v0.vm, 0, 0x1000, 0x1000, true, args->v0.vm, 0,
(1ULL << NVDEV_ENGINE_CE0) | (1ULL << NVKM_ENGINE_CE0) |
(1ULL << NVDEV_ENGINE_CE1) | (1ULL << NVKM_ENGINE_CE1) |
(1ULL << NVDEV_ENGINE_GR) | (1ULL << NVKM_ENGINE_GR) |
(1ULL << NVDEV_ENGINE_MSPDEC) | (1ULL << NVKM_ENGINE_MSPDEC) |
(1ULL << NVDEV_ENGINE_MSPPP) | (1ULL << NVKM_ENGINE_MSPPP) |
(1ULL << NVDEV_ENGINE_MSVLD) | (1ULL << NVKM_ENGINE_MSVLD) |
(1ULL << NVDEV_ENGINE_SW), (1ULL << NVKM_ENGINE_SW),
1, fifo->user.bar.offset, 0x1000, 1, fifo->user.bar.offset, 0x1000,
oclass, &chan->base); oclass, &chan->base);
if (ret) if (ret)
......
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
View file @ 68f3f702
...@@ -57,14 +57,14 @@ static u32 ...@@ -57,14 +57,14 @@ static u32
gk104_fifo_gpfifo_engine_addr(struct nvkm_engine *engine) gk104_fifo_gpfifo_engine_addr(struct nvkm_engine *engine)
{ {
switch (engine->subdev.index) { switch (engine->subdev.index) {
case NVDEV_ENGINE_SW : case NVKM_ENGINE_SW :
case NVDEV_ENGINE_CE0 : case NVKM_ENGINE_CE0 :
case NVDEV_ENGINE_CE1 : case NVKM_ENGINE_CE1 :
case NVDEV_ENGINE_CE2 : return 0x0000; case NVKM_ENGINE_CE2 : return 0x0000;
case NVDEV_ENGINE_GR : return 0x0210; case NVKM_ENGINE_GR : return 0x0210;
case NVDEV_ENGINE_MSPDEC: return 0x0250; case NVKM_ENGINE_MSPDEC: return 0x0250;
case NVDEV_ENGINE_MSPPP : return 0x0260; case NVKM_ENGINE_MSPPP : return 0x0260;
case NVDEV_ENGINE_MSVLD : return 0x0270; case NVKM_ENGINE_MSVLD : return 0x0270;
default: default:
WARN_ON(1); WARN_ON(1);
return 0; return 0;
...@@ -134,12 +134,6 @@ gk104_fifo_gpfifo_engine_ctor(struct nvkm_fifo_chan *base, ...@@ -134,12 +134,6 @@ gk104_fifo_gpfifo_engine_ctor(struct nvkm_fifo_chan *base,
if (!gk104_fifo_gpfifo_engine_addr(engine)) if (!gk104_fifo_gpfifo_engine_addr(engine))
return 0; return 0;
if (object->oclass) {
return nvkm_gpuobj_map(nv_gpuobj(object), chan->vm,
NV_MEM_ACCESS_RW,
&chan->engn[engn].vma);
}
ret = nvkm_object_bind(object, NULL, 0, &chan->engn[engn].inst); ret = nvkm_object_bind(object, NULL, 0, &chan->engn[engn].inst);
if (ret) if (ret)
return ret; return ret;
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c
View file @ 68f3f702
...@@ -1047,7 +1047,7 @@ nv04_gr_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent, ...@@ -1047,7 +1047,7 @@ nv04_gr_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent,
false, parent, pgpuobj); false, parent, pgpuobj);
if (ret == 0) { if (ret == 0) {
nvkm_kmap(*pgpuobj); nvkm_kmap(*pgpuobj);
nvkm_wo32(*pgpuobj, 0x00, object->oclass_name); nvkm_wo32(*pgpuobj, 0x00, object->oclass);
nvkm_wo32(*pgpuobj, 0x04, 0x00000000); nvkm_wo32(*pgpuobj, 0x04, 0x00000000);
nvkm_wo32(*pgpuobj, 0x08, 0x00000000); nvkm_wo32(*pgpuobj, 0x08, 0x00000000);
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
View file @ 68f3f702
...@@ -48,7 +48,7 @@ nv40_gr_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent, ...@@ -48,7 +48,7 @@ nv40_gr_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent,
false, parent, pgpuobj); false, parent, pgpuobj);
if (ret == 0) { if (ret == 0) {
nvkm_kmap(*pgpuobj); nvkm_kmap(*pgpuobj);
nvkm_wo32(*pgpuobj, 0x00, object->oclass_name); nvkm_wo32(*pgpuobj, 0x00, object->oclass);
nvkm_wo32(*pgpuobj, 0x04, 0x00000000); nvkm_wo32(*pgpuobj, 0x04, 0x00000000);
nvkm_wo32(*pgpuobj, 0x08, 0x00000000); nvkm_wo32(*pgpuobj, 0x08, 0x00000000);
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c
View file @ 68f3f702
...@@ -45,7 +45,7 @@ nv50_gr_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent, ...@@ -45,7 +45,7 @@ nv50_gr_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent,
align, false, parent, pgpuobj); align, false, parent, pgpuobj);
if (ret == 0) { if (ret == 0) {
nvkm_kmap(*pgpuobj); nvkm_kmap(*pgpuobj);
nvkm_wo32(*pgpuobj, 0x00, object->oclass_name); nvkm_wo32(*pgpuobj, 0x00, object->oclass);
nvkm_wo32(*pgpuobj, 0x04, 0x00000000); nvkm_wo32(*pgpuobj, 0x04, 0x00000000);
nvkm_wo32(*pgpuobj, 0x08, 0x00000000); nvkm_wo32(*pgpuobj, 0x08, 0x00000000);
nvkm_wo32(*pgpuobj, 0x0c, 0x00000000); nvkm_wo32(*pgpuobj, 0x0c, 0x00000000);
......
drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c
View file @ 68f3f702
...@@ -43,7 +43,7 @@ nv31_mpeg_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent, ...@@ -43,7 +43,7 @@ nv31_mpeg_object_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent,
false, parent, pgpuobj); false, parent, pgpuobj);
if (ret == 0) { if (ret == 0) {
nvkm_kmap(*pgpuobj); nvkm_kmap(*pgpuobj);
nvkm_wo32(*pgpuobj, 0x00, object->oclass_name); nvkm_wo32(*pgpuobj, 0x00, object->oclass);
nvkm_wo32(*pgpuobj, 0x04, 0x00000000); nvkm_wo32(*pgpuobj, 0x04, 0x00000000);
nvkm_wo32(*pgpuobj, 0x08, 0x00000000); nvkm_wo32(*pgpuobj, 0x08, 0x00000000);
nvkm_wo32(*pgpuobj, 0x0c, 0x00000000); nvkm_wo32(*pgpuobj, 0x0c, 0x00000000);
......
drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
View file @ 68f3f702
...@@ -64,7 +64,7 @@ gf100_bar_ctor_vm(struct gf100_bar *bar, struct gf100_bar_vm *bar_vm, ...@@ -64,7 +64,7 @@ gf100_bar_ctor_vm(struct gf100_bar *bar, struct gf100_bar_vm *bar_vm,
if (ret) if (ret)
return ret; return ret;
atomic_inc(&vm->engref[NVDEV_SUBDEV_BAR]); atomic_inc(&vm->engref[NVKM_SUBDEV_BAR]);
/* /*
* Bootstrap page table lookup. * Bootstrap page table lookup.
......
drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
View file @ 68f3f702
...@@ -88,7 +88,7 @@ nv50_bar_oneinit(struct nvkm_bar *base) ...@@ -88,7 +88,7 @@ nv50_bar_oneinit(struct nvkm_bar *base)
if (ret) if (ret)
return ret; return ret;
atomic_inc(&vm->engref[NVDEV_SUBDEV_BAR]); atomic_inc(&vm->engref[NVKM_SUBDEV_BAR]);
ret = nvkm_vm_boot(vm, limit-- - start); ret = nvkm_vm_boot(vm, limit-- - start);
if (ret) if (ret)
...@@ -121,7 +121,7 @@ nv50_bar_oneinit(struct nvkm_bar *base) ...@@ -121,7 +121,7 @@ nv50_bar_oneinit(struct nvkm_bar *base)
if (ret) if (ret)
return ret; return ret;
atomic_inc(&vm->engref[NVDEV_SUBDEV_BAR]); atomic_inc(&vm->engref[NVKM_SUBDEV_BAR]);
ret = nvkm_vm_ref(vm, &bar->bar1_vm, bar->pgd); ret = nvkm_vm_ref(vm, &bar->bar1_vm, bar->pgd);
nvkm_vm_ref(NULL, &vm, NULL); nvkm_vm_ref(NULL, &vm, NULL);
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
View file @ 68f3f702
...@@ -35,18 +35,18 @@ g84_devinit_disable(struct nvkm_devinit *init) ...@@ -35,18 +35,18 @@ g84_devinit_disable(struct nvkm_devinit *init)
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {
disable |= (1ULL << NVDEV_ENGINE_MPEG); disable |= (1ULL << NVKM_ENGINE_MPEG);
disable |= (1ULL << NVDEV_ENGINE_VP); disable |= (1ULL << NVKM_ENGINE_VP);
disable |= (1ULL << NVDEV_ENGINE_BSP); disable |= (1ULL << NVKM_ENGINE_BSP);
disable |= (1ULL << NVDEV_ENGINE_CIPHER); disable |= (1ULL << NVKM_ENGINE_CIPHER);
} }
if (!(r00154c & 0x00000004)) if (!(r00154c & 0x00000004))
disable |= (1ULL << NVDEV_ENGINE_DISP); disable |= (1ULL << NVKM_ENGINE_DISP);
if (!(r00154c & 0x00000020)) if (!(r00154c & 0x00000020))
disable |= (1ULL << NVDEV_ENGINE_BSP); disable |= (1ULL << NVKM_ENGINE_BSP);
if (!(r00154c & 0x00000040)) if (!(r00154c & 0x00000040))
disable |= (1ULL << NVDEV_ENGINE_CIPHER); disable |= (1ULL << NVKM_ENGINE_CIPHER);
return disable; return disable;
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
View file @ 68f3f702
...@@ -35,17 +35,17 @@ g98_devinit_disable(struct nvkm_devinit *init) ...@@ -35,17 +35,17 @@ g98_devinit_disable(struct nvkm_devinit *init)
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {
disable |= (1ULL << NVDEV_ENGINE_MSPDEC); disable |= (1ULL << NVKM_ENGINE_MSPDEC);
disable |= (1ULL << NVDEV_ENGINE_MSVLD); disable |= (1ULL << NVKM_ENGINE_MSVLD);
disable |= (1ULL << NVDEV_ENGINE_MSPPP); disable |= (1ULL << NVKM_ENGINE_MSPPP);
} }
if (!(r00154c & 0x00000004)) if (!(r00154c & 0x00000004))
disable |= (1ULL << NVDEV_ENGINE_DISP); disable |= (1ULL << NVKM_ENGINE_DISP);
if (!(r00154c & 0x00000020)) if (!(r00154c & 0x00000020))
disable |= (1ULL << NVDEV_ENGINE_MSVLD); disable |= (1ULL << NVKM_ENGINE_MSVLD);
if (!(r00154c & 0x00000040)) if (!(r00154c & 0x00000040))
disable |= (1ULL << NVDEV_ENGINE_SEC); disable |= (1ULL << NVKM_ENGINE_SEC);
return disable; return disable;
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
View file @ 68f3f702
...@@ -71,21 +71,21 @@ gf100_devinit_disable(struct nvkm_devinit *init) ...@@ -71,21 +71,21 @@ gf100_devinit_disable(struct nvkm_devinit *init)
u64 disable = 0ULL; u64 disable = 0ULL;
if (r022500 & 0x00000001) if (r022500 & 0x00000001)
disable |= (1ULL << NVDEV_ENGINE_DISP); disable |= (1ULL << NVKM_ENGINE_DISP);
if (r022500 & 0x00000002) { if (r022500 & 0x00000002) {
disable |= (1ULL << NVDEV_ENGINE_MSPDEC); disable |= (1ULL << NVKM_ENGINE_MSPDEC);
disable |= (1ULL << NVDEV_ENGINE_MSPPP); disable |= (1ULL << NVKM_ENGINE_MSPPP);
} }
if (r022500 & 0x00000004) if (r022500 & 0x00000004)
disable |= (1ULL << NVDEV_ENGINE_MSVLD); disable |= (1ULL << NVKM_ENGINE_MSVLD);
if (r022500 & 0x00000008) if (r022500 & 0x00000008)
disable |= (1ULL << NVDEV_ENGINE_MSENC); disable |= (1ULL << NVKM_ENGINE_MSENC);
if (r022500 & 0x00000100) if (r022500 & 0x00000100)
disable |= (1ULL << NVDEV_ENGINE_CE0); disable |= (1ULL << NVKM_ENGINE_CE0);
if (r022500 & 0x00000200) if (r022500 & 0x00000200)
disable |= (1ULL << NVDEV_ENGINE_CE1); disable |= (1ULL << NVKM_ENGINE_CE1);
return disable; return disable;
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
View file @ 68f3f702
...@@ -35,11 +35,11 @@ gm107_devinit_disable(struct nvkm_devinit *init) ...@@ -35,11 +35,11 @@ gm107_devinit_disable(struct nvkm_devinit *init)
u64 disable = 0ULL; u64 disable = 0ULL;
if (r021c00 & 0x00000001) if (r021c00 & 0x00000001)
disable |= (1ULL << NVDEV_ENGINE_CE0); disable |= (1ULL << NVKM_ENGINE_CE0);
if (r021c00 & 0x00000004) if (r021c00 & 0x00000004)
disable |= (1ULL << NVDEV_ENGINE_CE2); disable |= (1ULL << NVKM_ENGINE_CE2);
if (r021c04 & 0x00000001) if (r021c04 & 0x00000001)
disable |= (1ULL << NVDEV_ENGINE_DISP); disable |= (1ULL << NVKM_ENGINE_DISP);
return disable; return disable;
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c
View file @ 68f3f702
...@@ -71,16 +71,16 @@ gt215_devinit_disable(struct nvkm_devinit *init) ...@@ -71,16 +71,16 @@ gt215_devinit_disable(struct nvkm_devinit *init)
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {
disable |= (1ULL << NVDEV_ENGINE_MSPDEC); disable |= (1ULL << NVKM_ENGINE_MSPDEC);
disable |= (1ULL << NVDEV_ENGINE_MSPPP); disable |= (1ULL << NVKM_ENGINE_MSPPP);
} }
if (!(r00154c & 0x00000004)) if (!(r00154c & 0x00000004))
disable |= (1ULL << NVDEV_ENGINE_DISP); disable |= (1ULL << NVKM_ENGINE_DISP);
if (!(r00154c & 0x00000020)) if (!(r00154c & 0x00000020))
disable |= (1ULL << NVDEV_ENGINE_MSVLD); disable |= (1ULL << NVKM_ENGINE_MSVLD);
if (!(r00154c & 0x00000200)) if (!(r00154c & 0x00000200))
disable |= (1ULL << NVDEV_ENGINE_CE0); disable |= (1ULL << NVKM_ENGINE_CE0);
return disable; return disable;
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c
View file @ 68f3f702
...@@ -35,18 +35,18 @@ mcp89_devinit_disable(struct nvkm_devinit *init) ...@@ -35,18 +35,18 @@ mcp89_devinit_disable(struct nvkm_devinit *init)
u64 disable = 0; u64 disable = 0;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {
disable |= (1ULL << NVDEV_ENGINE_MSPDEC); disable |= (1ULL << NVKM_ENGINE_MSPDEC);
disable |= (1ULL << NVDEV_ENGINE_MSPPP); disable |= (1ULL << NVKM_ENGINE_MSPPP);
} }
if (!(r00154c & 0x00000004)) if (!(r00154c & 0x00000004))
disable |= (1ULL << NVDEV_ENGINE_DISP); disable |= (1ULL << NVKM_ENGINE_DISP);
if (!(r00154c & 0x00000020)) if (!(r00154c & 0x00000020))
disable |= (1ULL << NVDEV_ENGINE_MSVLD); disable |= (1ULL << NVKM_ENGINE_MSVLD);
if (!(r00154c & 0x00000040)) if (!(r00154c & 0x00000040))
disable |= (1ULL << NVDEV_ENGINE_VIC); disable |= (1ULL << NVKM_ENGINE_VIC);
if (!(r00154c & 0x00000200)) if (!(r00154c & 0x00000200))
disable |= (1ULL << NVDEV_ENGINE_CE0); disable |= (1ULL << NVKM_ENGINE_CE0);
return disable; return disable;
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
View file @ 68f3f702
...@@ -85,7 +85,7 @@ nv50_devinit_disable(struct nvkm_devinit *init) ...@@ -85,7 +85,7 @@ nv50_devinit_disable(struct nvkm_devinit *init)
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) if (!(r001540 & 0x40000000))
disable |= (1ULL << NVDEV_ENGINE_MPEG); disable |= (1ULL << NVKM_ENGINE_MPEG);
return disable; return disable;
} }
...@@ -103,7 +103,7 @@ nv50_devinit_preinit(struct nvkm_devinit *base) ...@@ -103,7 +103,7 @@ nv50_devinit_preinit(struct nvkm_devinit *base)
*/ */
if (!init->base.post) { if (!init->base.post) {
u64 disable = nvkm_devinit_disable(&init->base); u64 disable = nvkm_devinit_disable(&init->base);
if (disable & (1ULL << NVDEV_ENGINE_DISP)) if (disable & (1ULL << NVKM_ENGINE_DISP))
init->base.post = true; init->base.post = true;
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c
View file @ 68f3f702
...@@ -25,22 +25,22 @@ ...@@ -25,22 +25,22 @@
static const struct nvkm_mc_intr static const struct nvkm_mc_intr
g98_mc_intr[] = { g98_mc_intr[] = {
{ 0x04000000, NVDEV_ENGINE_DISP }, /* DISP first, so pageflip timestamps work */ { 0x04000000, NVKM_ENGINE_DISP }, /* DISP first, so pageflip timestamps work */
{ 0x00000001, NVDEV_ENGINE_MSPPP }, { 0x00000001, NVKM_ENGINE_MSPPP },
{ 0x00000100, NVDEV_ENGINE_FIFO }, { 0x00000100, NVKM_ENGINE_FIFO },
{ 0x00001000, NVDEV_ENGINE_GR }, { 0x00001000, NVKM_ENGINE_GR },
{ 0x00004000, NVDEV_ENGINE_SEC }, /* NV84:NVA3 */ { 0x00004000, NVKM_ENGINE_SEC }, /* NV84:NVA3 */
{ 0x00008000, NVDEV_ENGINE_MSVLD }, { 0x00008000, NVKM_ENGINE_MSVLD },
{ 0x00020000, NVDEV_ENGINE_MSPDEC }, { 0x00020000, NVKM_ENGINE_MSPDEC },
{ 0x00040000, NVDEV_SUBDEV_PMU }, /* NVA3:NVC0 */ { 0x00040000, NVKM_SUBDEV_PMU }, /* NVA3:NVC0 */
{ 0x00080000, NVDEV_SUBDEV_THERM }, /* NVA3:NVC0 */ { 0x00080000, NVKM_SUBDEV_THERM }, /* NVA3:NVC0 */
{ 0x00100000, NVDEV_SUBDEV_TIMER }, { 0x00100000, NVKM_SUBDEV_TIMER },
{ 0x00200000, NVDEV_SUBDEV_GPIO }, /* PMGR->GPIO */ { 0x00200000, NVKM_SUBDEV_GPIO }, /* PMGR->GPIO */
{ 0x00200000, NVDEV_SUBDEV_I2C }, /* PMGR->I2C/AUX */ { 0x00200000, NVKM_SUBDEV_I2C }, /* PMGR->I2C/AUX */
{ 0x00400000, NVDEV_ENGINE_CE0 }, /* NVA3- */ { 0x00400000, NVKM_ENGINE_CE0 }, /* NVA3- */
{ 0x10000000, NVDEV_SUBDEV_BUS }, { 0x10000000, NVKM_SUBDEV_BUS },
{ 0x80000000, NVDEV_ENGINE_SW }, { 0x80000000, NVKM_ENGINE_SW },
{ 0x0042d101, NVDEV_SUBDEV_FB }, { 0x0042d101, NVKM_SUBDEV_FB },
{}, {},
}; };
......
drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c
View file @ 68f3f702
...@@ -25,26 +25,26 @@ ...@@ -25,26 +25,26 @@
const struct nvkm_mc_intr const struct nvkm_mc_intr
gf100_mc_intr[] = { gf100_mc_intr[] = {
{ 0x04000000, NVDEV_ENGINE_DISP }, /* DISP first, so pageflip timestamps work. */ { 0x04000000, NVKM_ENGINE_DISP }, /* DISP first, so pageflip timestamps work. */
{ 0x00000001, NVDEV_ENGINE_MSPPP }, { 0x00000001, NVKM_ENGINE_MSPPP },
{ 0x00000020, NVDEV_ENGINE_CE0 }, { 0x00000020, NVKM_ENGINE_CE0 },
{ 0x00000040, NVDEV_ENGINE_CE1 }, { 0x00000040, NVKM_ENGINE_CE1 },
{ 0x00000080, NVDEV_ENGINE_CE2 }, { 0x00000080, NVKM_ENGINE_CE2 },
{ 0x00000100, NVDEV_ENGINE_FIFO }, { 0x00000100, NVKM_ENGINE_FIFO },
{ 0x00001000, NVDEV_ENGINE_GR }, { 0x00001000, NVKM_ENGINE_GR },
{ 0x00002000, NVDEV_SUBDEV_FB }, { 0x00002000, NVKM_SUBDEV_FB },
{ 0x00008000, NVDEV_ENGINE_MSVLD }, { 0x00008000, NVKM_ENGINE_MSVLD },
{ 0x00040000, NVDEV_SUBDEV_THERM }, { 0x00040000, NVKM_SUBDEV_THERM },
{ 0x00020000, NVDEV_ENGINE_MSPDEC }, { 0x00020000, NVKM_ENGINE_MSPDEC },
{ 0x00100000, NVDEV_SUBDEV_TIMER }, { 0x00100000, NVKM_SUBDEV_TIMER },
{ 0x00200000, NVDEV_SUBDEV_GPIO }, /* PMGR->GPIO */ { 0x00200000, NVKM_SUBDEV_GPIO }, /* PMGR->GPIO */
{ 0x00200000, NVDEV_SUBDEV_I2C }, /* PMGR->I2C/AUX */ { 0x00200000, NVKM_SUBDEV_I2C }, /* PMGR->I2C/AUX */
{ 0x01000000, NVDEV_SUBDEV_PMU }, { 0x01000000, NVKM_SUBDEV_PMU },
{ 0x02000000, NVDEV_SUBDEV_LTC }, { 0x02000000, NVKM_SUBDEV_LTC },
{ 0x08000000, NVDEV_SUBDEV_FB }, { 0x08000000, NVKM_SUBDEV_FB },
{ 0x10000000, NVDEV_SUBDEV_BUS }, { 0x10000000, NVKM_SUBDEV_BUS },
{ 0x40000000, NVDEV_SUBDEV_IBUS }, { 0x40000000, NVKM_SUBDEV_IBUS },
{ 0x80000000, NVDEV_ENGINE_SW }, { 0x80000000, NVKM_ENGINE_SW },
{}, {},
}; };
......
drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c
View file @ 68f3f702
...@@ -25,16 +25,16 @@ ...@@ -25,16 +25,16 @@
const struct nvkm_mc_intr const struct nvkm_mc_intr
nv04_mc_intr[] = { nv04_mc_intr[] = {
{ 0x00000001, NVDEV_ENGINE_MPEG }, /* NV17- MPEG/ME */ { 0x00000001, NVKM_ENGINE_MPEG }, /* NV17- MPEG/ME */
{ 0x00000100, NVDEV_ENGINE_FIFO }, { 0x00000100, NVKM_ENGINE_FIFO },
{ 0x00001000, NVDEV_ENGINE_GR }, { 0x00001000, NVKM_ENGINE_GR },
{ 0x00010000, NVDEV_ENGINE_DISP }, { 0x00010000, NVKM_ENGINE_DISP },
{ 0x00020000, NVDEV_ENGINE_VP }, /* NV40- */ { 0x00020000, NVKM_ENGINE_VP }, /* NV40- */
{ 0x00100000, NVDEV_SUBDEV_TIMER }, { 0x00100000, NVKM_SUBDEV_TIMER },
{ 0x01000000, NVDEV_ENGINE_DISP }, /* NV04- PCRTC0 */ { 0x01000000, NVKM_ENGINE_DISP }, /* NV04- PCRTC0 */
{ 0x02000000, NVDEV_ENGINE_DISP }, /* NV11- PCRTC1 */ { 0x02000000, NVKM_ENGINE_DISP }, /* NV11- PCRTC1 */
{ 0x10000000, NVDEV_SUBDEV_BUS }, { 0x10000000, NVKM_SUBDEV_BUS },
{ 0x80000000, NVDEV_ENGINE_SW }, { 0x80000000, NVKM_ENGINE_SW },
{} {}
}; };
......
drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv50.c
View file @ 68f3f702
...@@ -25,19 +25,19 @@ ...@@ -25,19 +25,19 @@
const struct nvkm_mc_intr const struct nvkm_mc_intr
nv50_mc_intr[] = { nv50_mc_intr[] = {
{ 0x04000000, NVDEV_ENGINE_DISP }, /* DISP before FIFO, so pageflip-timestamping works! */ { 0x04000000, NVKM_ENGINE_DISP }, /* DISP before FIFO, so pageflip-timestamping works! */
{ 0x00000001, NVDEV_ENGINE_MPEG }, { 0x00000001, NVKM_ENGINE_MPEG },
{ 0x00000100, NVDEV_ENGINE_FIFO }, { 0x00000100, NVKM_ENGINE_FIFO },
{ 0x00001000, NVDEV_ENGINE_GR }, { 0x00001000, NVKM_ENGINE_GR },
{ 0x00004000, NVDEV_ENGINE_CIPHER }, /* NV84- */ { 0x00004000, NVKM_ENGINE_CIPHER }, /* NV84- */
{ 0x00008000, NVDEV_ENGINE_BSP }, /* NV84- */ { 0x00008000, NVKM_ENGINE_BSP }, /* NV84- */
{ 0x00020000, NVDEV_ENGINE_VP }, /* NV84- */ { 0x00020000, NVKM_ENGINE_VP }, /* NV84- */
{ 0x00100000, NVDEV_SUBDEV_TIMER }, { 0x00100000, NVKM_SUBDEV_TIMER },
{ 0x00200000, NVDEV_SUBDEV_GPIO }, /* PMGR->GPIO */ { 0x00200000, NVKM_SUBDEV_GPIO }, /* PMGR->GPIO */
{ 0x00200000, NVDEV_SUBDEV_I2C }, /* PMGR->I2C/AUX */ { 0x00200000, NVKM_SUBDEV_I2C }, /* PMGR->I2C/AUX */
{ 0x10000000, NVDEV_SUBDEV_BUS }, { 0x10000000, NVKM_SUBDEV_BUS },
{ 0x80000000, NVDEV_ENGINE_SW }, { 0x80000000, NVKM_ENGINE_SW },
{ 0x0002d101, NVDEV_SUBDEV_FB }, { 0x0002d101, NVKM_SUBDEV_FB },
{}, {},
}; };
......
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c
View file @ 68f3f702
...@@ -167,7 +167,7 @@ gf100_vm_flush(struct nvkm_vm *vm) ...@@ -167,7 +167,7 @@ gf100_vm_flush(struct nvkm_vm *vm)
u32 type; u32 type;
type = 0x00000001; /* PAGE_ALL */ type = 0x00000001; /* PAGE_ALL */
if (atomic_read(&vm->engref[NVDEV_SUBDEV_BAR])) if (atomic_read(&vm->engref[NVKM_SUBDEV_BAR]))
type |= 0x00000004; /* HUB_ONLY */ type |= 0x00000004; /* HUB_ONLY */
mutex_lock(&mmu->subdev.mutex); mutex_lock(&mmu->subdev.mutex);
......
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv50.c
View file @ 68f3f702
...@@ -161,29 +161,29 @@ nv50_vm_flush(struct nvkm_vm *vm) ...@@ -161,29 +161,29 @@ nv50_vm_flush(struct nvkm_vm *vm)
int i, vme; int i, vme;
mutex_lock(&subdev->mutex); mutex_lock(&subdev->mutex);
for (i = 0; i < NVDEV_SUBDEV_NR; i++) { for (i = 0; i < NVKM_SUBDEV_NR; i++) {
if (!atomic_read(&vm->engref[i])) if (!atomic_read(&vm->engref[i]))
continue; continue;
/* unfortunate hw bug workaround... */ /* unfortunate hw bug workaround... */
if (i == NVDEV_ENGINE_GR && device->gr) { if (i == NVKM_ENGINE_GR && device->gr) {
int ret = nvkm_gr_tlb_flush(device->gr); int ret = nvkm_gr_tlb_flush(device->gr);
if (ret != -ENODEV) if (ret != -ENODEV)
continue; continue;
} }
switch (i) { switch (i) {
case NVDEV_ENGINE_GR : vme = 0x00; break; case NVKM_ENGINE_GR : vme = 0x00; break;
case NVDEV_ENGINE_VP : case NVKM_ENGINE_VP :
case NVDEV_ENGINE_MSPDEC: vme = 0x01; break; case NVKM_ENGINE_MSPDEC: vme = 0x01; break;
case NVDEV_SUBDEV_BAR : vme = 0x06; break; case NVKM_SUBDEV_BAR : vme = 0x06; break;
case NVDEV_ENGINE_MSPPP : case NVKM_ENGINE_MSPPP :
case NVDEV_ENGINE_MPEG : vme = 0x08; break; case NVKM_ENGINE_MPEG : vme = 0x08; break;
case NVDEV_ENGINE_BSP : case NVKM_ENGINE_BSP :
case NVDEV_ENGINE_MSVLD : vme = 0x09; break; case NVKM_ENGINE_MSVLD : vme = 0x09; break;
case NVDEV_ENGINE_CIPHER: case NVKM_ENGINE_CIPHER:
case NVDEV_ENGINE_SEC : vme = 0x0a; break; case NVKM_ENGINE_SEC : vme = 0x0a; break;
case NVDEV_ENGINE_CE0 : vme = 0x0d; break; case NVKM_ENGINE_CE0 : vme = 0x0d; break;
default: default:
continue; continue;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7