mirror of https://gitee.com/openkylin/linux.git
drm/nouveau/core/device: remove object include to prevent unnecessary rebuilds
nvkm_device hasn't subclassed nvkm_object in a long time. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
82be74ee3b
commit
4246b92cf9
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __NVKM_DEVICE_H__
|
#ifndef __NVKM_DEVICE_H__
|
||||||
#define __NVKM_DEVICE_H__
|
#define __NVKM_DEVICE_H__
|
||||||
|
#include <core/oclass.h>
|
||||||
#include <core/event.h>
|
#include <core/event.h>
|
||||||
#include <core/object.h>
|
|
||||||
|
|
||||||
enum nvkm_devidx {
|
enum nvkm_devidx {
|
||||||
NVKM_SUBDEV_PCI,
|
NVKM_SUBDEV_PCI,
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#ifndef __NVKM_DMA_H__
|
#ifndef __NVKM_DMA_H__
|
||||||
#define __NVKM_DMA_H__
|
#define __NVKM_DMA_H__
|
||||||
#include <core/engine.h>
|
#include <core/engine.h>
|
||||||
|
#include <core/object.h>
|
||||||
struct nvkm_client;
|
struct nvkm_client;
|
||||||
|
|
||||||
struct nvkm_dmaobj {
|
struct nvkm_dmaobj {
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#define nvkm_falcon(p) container_of((p), struct nvkm_falcon, engine)
|
#define nvkm_falcon(p) container_of((p), struct nvkm_falcon, engine)
|
||||||
#include <core/engine.h>
|
#include <core/engine.h>
|
||||||
struct nvkm_fifo_chan;
|
struct nvkm_fifo_chan;
|
||||||
|
struct nvkm_gpuobj;
|
||||||
|
|
||||||
enum nvkm_falcon_dmaidx {
|
enum nvkm_falcon_dmaidx {
|
||||||
FALCON_DMAIDX_UCODE = 0,
|
FALCON_DMAIDX_UCODE = 0,
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#ifndef __NVKM_FIFO_H__
|
#ifndef __NVKM_FIFO_H__
|
||||||
#define __NVKM_FIFO_H__
|
#define __NVKM_FIFO_H__
|
||||||
#include <core/engine.h>
|
#include <core/engine.h>
|
||||||
|
#include <core/object.h>
|
||||||
#include <core/event.h>
|
#include <core/event.h>
|
||||||
|
|
||||||
#define NVKM_FIFO_CHID_NR 4096
|
#define NVKM_FIFO_CHID_NR 4096
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define __NVKM_MMU_H__
|
#define __NVKM_MMU_H__
|
||||||
#include <core/subdev.h>
|
#include <core/subdev.h>
|
||||||
#include <core/mm.h>
|
#include <core/mm.h>
|
||||||
struct nvkm_device;
|
struct nvkm_gpuobj;
|
||||||
struct nvkm_mem;
|
struct nvkm_mem;
|
||||||
|
|
||||||
struct nvkm_vm_pgt {
|
struct nvkm_vm_pgt {
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
*/
|
*/
|
||||||
#include <core/ramht.h>
|
#include <core/ramht.h>
|
||||||
#include <core/engine.h>
|
#include <core/engine.h>
|
||||||
|
#include <core/object.h>
|
||||||
|
|
||||||
static u32
|
static u32
|
||||||
nvkm_ramht_hash(struct nvkm_ramht *ramht, int chid, u32 handle)
|
nvkm_ramht_hash(struct nvkm_ramht *ramht, int chid, u32 handle)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __NVKM_DEVICE_CTRL_H__
|
#ifndef __NVKM_DEVICE_CTRL_H__
|
||||||
#define __NVKM_DEVICE_CTRL_H__
|
#define __NVKM_DEVICE_CTRL_H__
|
||||||
#define nvkm_control(p) container_of((p), struct nvkm_control, object)
|
#define nvkm_control(p) container_of((p), struct nvkm_control, object)
|
||||||
#include <core/device.h>
|
#include <core/object.h>
|
||||||
|
|
||||||
struct nvkm_control {
|
struct nvkm_control {
|
||||||
struct nvkm_object object;
|
struct nvkm_object object;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#ifndef __NV50_DISP_CHAN_H__
|
#ifndef __NV50_DISP_CHAN_H__
|
||||||
#define __NV50_DISP_CHAN_H__
|
#define __NV50_DISP_CHAN_H__
|
||||||
#define nv50_disp_chan(p) container_of((p), struct nv50_disp_chan, object)
|
#define nv50_disp_chan(p) container_of((p), struct nv50_disp_chan, object)
|
||||||
|
#include <core/object.h>
|
||||||
#include "nv50.h"
|
#include "nv50.h"
|
||||||
|
|
||||||
struct nv50_disp_chan {
|
struct nv50_disp_chan {
|
||||||
|
|
|
@ -156,6 +156,7 @@ int gp100_gr_init(struct gf100_gr *);
|
||||||
void gp100_gr_init_rop_active_fbps(struct gf100_gr *);
|
void gp100_gr_init_rop_active_fbps(struct gf100_gr *);
|
||||||
|
|
||||||
#define gf100_gr_chan(p) container_of((p), struct gf100_gr_chan, object)
|
#define gf100_gr_chan(p) container_of((p), struct gf100_gr_chan, object)
|
||||||
|
#include <core/object.h>
|
||||||
|
|
||||||
struct gf100_gr_chan {
|
struct gf100_gr_chan {
|
||||||
struct nvkm_object object;
|
struct nvkm_object object;
|
||||||
|
|
|
@ -19,6 +19,7 @@ void nv20_gr_tile(struct nvkm_gr *, int, struct nvkm_fb_tile *);
|
||||||
int nv30_gr_init(struct nvkm_gr *);
|
int nv30_gr_init(struct nvkm_gr *);
|
||||||
|
|
||||||
#define nv20_gr_chan(p) container_of((p), struct nv20_gr_chan, object)
|
#define nv20_gr_chan(p) container_of((p), struct nv20_gr_chan, object)
|
||||||
|
#include <core/object.h>
|
||||||
|
|
||||||
struct nv20_gr_chan {
|
struct nv20_gr_chan {
|
||||||
struct nvkm_object object;
|
struct nvkm_object object;
|
||||||
|
|
|
@ -16,6 +16,7 @@ void nv40_gr_intr(struct nvkm_gr *);
|
||||||
u64 nv40_gr_units(struct nvkm_gr *);
|
u64 nv40_gr_units(struct nvkm_gr *);
|
||||||
|
|
||||||
#define nv40_gr_chan(p) container_of((p), struct nv40_gr_chan, object)
|
#define nv40_gr_chan(p) container_of((p), struct nv40_gr_chan, object)
|
||||||
|
#include <core/object.h>
|
||||||
|
|
||||||
struct nv40_gr_chan {
|
struct nv40_gr_chan {
|
||||||
struct nvkm_object object;
|
struct nvkm_object object;
|
||||||
|
|
|
@ -19,6 +19,7 @@ u64 nv50_gr_units(struct nvkm_gr *);
|
||||||
int g84_gr_tlb_flush(struct nvkm_gr *);
|
int g84_gr_tlb_flush(struct nvkm_gr *);
|
||||||
|
|
||||||
#define nv50_gr_chan(p) container_of((p), struct nv50_gr_chan, object)
|
#define nv50_gr_chan(p) container_of((p), struct nv50_gr_chan, object)
|
||||||
|
#include <core/object.h>
|
||||||
|
|
||||||
struct nv50_gr_chan {
|
struct nv50_gr_chan {
|
||||||
struct nvkm_object object;
|
struct nvkm_object object;
|
||||||
|
|
|
@ -18,6 +18,7 @@ struct nv31_mpeg_func {
|
||||||
};
|
};
|
||||||
|
|
||||||
#define nv31_mpeg_chan(p) container_of((p), struct nv31_mpeg_chan, object)
|
#define nv31_mpeg_chan(p) container_of((p), struct nv31_mpeg_chan, object)
|
||||||
|
#include <core/object.h>
|
||||||
|
|
||||||
struct nv31_mpeg_chan {
|
struct nv31_mpeg_chan {
|
||||||
struct nvkm_object object;
|
struct nvkm_object object;
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include "priv.h"
|
#include "priv.h"
|
||||||
|
|
||||||
#include <core/gpuobj.h>
|
#include <core/gpuobj.h>
|
||||||
|
#include <core/object.h>
|
||||||
#include <subdev/timer.h>
|
#include <subdev/timer.h>
|
||||||
|
|
||||||
#include <nvif/class.h>
|
#include <nvif/class.h>
|
||||||
|
|
|
@ -67,6 +67,7 @@ struct nvkm_specdom {
|
||||||
};
|
};
|
||||||
|
|
||||||
#define nvkm_perfdom(p) container_of((p), struct nvkm_perfdom, object)
|
#define nvkm_perfdom(p) container_of((p), struct nvkm_perfdom, object)
|
||||||
|
#include <core/object.h>
|
||||||
|
|
||||||
struct nvkm_perfdom {
|
struct nvkm_perfdom {
|
||||||
struct nvkm_object object;
|
struct nvkm_object object;
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
#ifndef __NVKM_SW_CHAN_H__
|
#ifndef __NVKM_SW_CHAN_H__
|
||||||
#define __NVKM_SW_CHAN_H__
|
#define __NVKM_SW_CHAN_H__
|
||||||
#define nvkm_sw_chan(p) container_of((p), struct nvkm_sw_chan, object)
|
#define nvkm_sw_chan(p) container_of((p), struct nvkm_sw_chan, object)
|
||||||
#include "priv.h"
|
#include <core/object.h>
|
||||||
#include <core/event.h>
|
#include <core/event.h>
|
||||||
|
|
||||||
|
#include "priv.h"
|
||||||
|
|
||||||
struct nvkm_sw_chan {
|
struct nvkm_sw_chan {
|
||||||
const struct nvkm_sw_chan_func *func;
|
const struct nvkm_sw_chan_func *func;
|
||||||
struct nvkm_object object;
|
struct nvkm_object object;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __NVKM_NVSW_H__
|
#ifndef __NVKM_NVSW_H__
|
||||||
#define __NVKM_NVSW_H__
|
#define __NVKM_NVSW_H__
|
||||||
#define nvkm_nvsw(p) container_of((p), struct nvkm_nvsw, object)
|
#define nvkm_nvsw(p) container_of((p), struct nvkm_nvsw, object)
|
||||||
#include "priv.h"
|
#include <core/object.h>
|
||||||
|
|
||||||
struct nvkm_nvsw {
|
struct nvkm_nvsw {
|
||||||
struct nvkm_object object;
|
struct nvkm_object object;
|
||||||
|
|
Loading…
Reference in New Issue