drm/nouveau: s/gm204/gm200/ in a number of places
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
parent
2ed95a4c65
commit
db1eb52846
|
|
@ -48,7 +48,7 @@
|
|||
#define GK104_DISP /* cl5070.h */ 0x00009170
|
||||
#define GK110_DISP /* cl5070.h */ 0x00009270
|
||||
#define GM107_DISP /* cl5070.h */ 0x00009470
|
||||
#define GM204_DISP /* cl5070.h */ 0x00009570
|
||||
#define GM200_DISP /* cl5070.h */ 0x00009570
|
||||
|
||||
#define NV31_MPEG 0x00003174
|
||||
#define G82_MPEG 0x00008274
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
#define GK104_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000917d
|
||||
#define GK110_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000927d
|
||||
#define GM107_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000947d
|
||||
#define GM204_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000957d
|
||||
#define GM200_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000957d
|
||||
|
||||
#define NV50_DISP_OVERLAY_CHANNEL_DMA /* cl507e.h */ 0x0000507e
|
||||
#define G82_DISP_OVERLAY_CHANNEL_DMA /* cl507e.h */ 0x0000827e
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@
|
|||
int gt215_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
|
||||
int gf100_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
|
||||
int gk104_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
|
||||
int gm204_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
|
||||
int gm200_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -31,5 +31,5 @@ int gf119_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
|||
int gk104_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
||||
int gk110_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
||||
int gm107_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
||||
int gm204_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
||||
int gm200_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -62,6 +62,6 @@ int gf100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
|||
int gk104_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gk208_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gk20a_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gm204_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gm200_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gm20b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -27,5 +27,5 @@ int gt215_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
|
|||
int mcp89_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
|
||||
int gf100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
|
||||
int gm107_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
|
||||
int gm204_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
|
||||
int gm200_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ int g94_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);
|
|||
int gf117_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);
|
||||
int gf119_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);
|
||||
int gk104_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);
|
||||
int gm204_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);
|
||||
int gm200_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);
|
||||
|
||||
static inline int
|
||||
nvkm_rdi2cr(struct i2c_adapter *adap, u8 addr, u8 reg)
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@ int gf100_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);
|
|||
int gf117_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);
|
||||
int gk104_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);
|
||||
int gk20a_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);
|
||||
int gm204_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);
|
||||
int gm200_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -37,5 +37,5 @@ int gf100_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **);
|
|||
int gk104_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **);
|
||||
int gk20a_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **);
|
||||
int gm107_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **);
|
||||
int gm204_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **);
|
||||
int gm200_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -495,7 +495,7 @@ nouveau_display_create(struct drm_device *dev)
|
|||
|
||||
if (nouveau_modeset != 2 && drm->vbios.dcb.entries) {
|
||||
static const u16 oclass[] = {
|
||||
GM204_DISP,
|
||||
GM200_DISP,
|
||||
GM107_DISP,
|
||||
GK110_DISP,
|
||||
GK104_DISP,
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ nv50_core_create(struct nvif_device *device, struct nvif_object *disp,
|
|||
.pushbuf = 0xb0007d00,
|
||||
};
|
||||
static const s32 oclass[] = {
|
||||
GM204_DISP_CORE_CHANNEL_DMA,
|
||||
GM200_DISP_CORE_CHANNEL_DMA,
|
||||
GM107_DISP_CORE_CHANNEL_DMA,
|
||||
GK110_DISP_CORE_CHANNEL_DMA,
|
||||
GK104_DISP_CORE_CHANNEL_DMA,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
nvkm-y += nvkm/engine/ce/gt215.o
|
||||
nvkm-y += nvkm/engine/ce/gf100.o
|
||||
nvkm-y += nvkm/engine/ce/gk104.o
|
||||
nvkm-y += nvkm/engine/ce/gm204.o
|
||||
nvkm-y += nvkm/engine/ce/gm200.o
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include <nvif/class.h>
|
||||
|
||||
static const struct nvkm_engine_func
|
||||
gm204_ce = {
|
||||
gm200_ce = {
|
||||
.intr = gk104_ce_intr,
|
||||
.sclass = {
|
||||
{ -1, -1, MAXWELL_DMA_COPY_A },
|
||||
|
|
@ -35,19 +35,19 @@ gm204_ce = {
|
|||
};
|
||||
|
||||
int
|
||||
gm204_ce_new(struct nvkm_device *device, int index,
|
||||
gm200_ce_new(struct nvkm_device *device, int index,
|
||||
struct nvkm_engine **pengine)
|
||||
{
|
||||
if (index == NVKM_ENGINE_CE0) {
|
||||
return nvkm_engine_new_(&gm204_ce, device, index,
|
||||
return nvkm_engine_new_(&gm200_ce, device, index,
|
||||
0x00000040, true, pengine);
|
||||
} else
|
||||
if (index == NVKM_ENGINE_CE1) {
|
||||
return nvkm_engine_new_(&gm204_ce, device, index,
|
||||
return nvkm_engine_new_(&gm200_ce, device, index,
|
||||
0x00000080, true, pengine);
|
||||
} else
|
||||
if (index == NVKM_ENGINE_CE2) {
|
||||
return nvkm_engine_new_(&gm204_ce, device, index,
|
||||
return nvkm_engine_new_(&gm200_ce, device, index,
|
||||
0x00200000, true, pengine);
|
||||
}
|
||||
return -ENODEV;
|
||||
|
|
@ -1968,14 +1968,14 @@ nv120_chipset = {
|
|||
.bar = gf100_bar_new,
|
||||
.bios = nvkm_bios_new,
|
||||
.bus = gf100_bus_new,
|
||||
.devinit = gm204_devinit_new,
|
||||
.devinit = gm200_devinit_new,
|
||||
.fb = gm107_fb_new,
|
||||
.fuse = gm107_fuse_new,
|
||||
.gpio = gk104_gpio_new,
|
||||
.i2c = gm204_i2c_new,
|
||||
.ibus = gm204_ibus_new,
|
||||
.i2c = gm200_i2c_new,
|
||||
.ibus = gm200_ibus_new,
|
||||
.imem = nv50_instmem_new,
|
||||
.ltc = gm204_ltc_new,
|
||||
.ltc = gm200_ltc_new,
|
||||
.mc = gk20a_mc_new,
|
||||
.mmu = gf100_mmu_new,
|
||||
.mxm = nv50_mxm_new,
|
||||
|
|
@ -1983,12 +1983,12 @@ nv120_chipset = {
|
|||
.pmu = gm107_pmu_new,
|
||||
.timer = gk20a_timer_new,
|
||||
.volt = gk104_volt_new,
|
||||
.ce[0] = gm204_ce_new,
|
||||
.ce[1] = gm204_ce_new,
|
||||
.ce[2] = gm204_ce_new,
|
||||
.disp = gm204_disp_new,
|
||||
.ce[0] = gm200_ce_new,
|
||||
.ce[1] = gm200_ce_new,
|
||||
.ce[2] = gm200_ce_new,
|
||||
.disp = gm200_disp_new,
|
||||
.dma = gf119_dma_new,
|
||||
.fifo = gm204_fifo_new,
|
||||
.fifo = gm200_fifo_new,
|
||||
.sw = gf100_sw_new,
|
||||
};
|
||||
|
||||
|
|
@ -1998,14 +1998,14 @@ nv124_chipset = {
|
|||
.bar = gf100_bar_new,
|
||||
.bios = nvkm_bios_new,
|
||||
.bus = gf100_bus_new,
|
||||
.devinit = gm204_devinit_new,
|
||||
.devinit = gm200_devinit_new,
|
||||
.fb = gm107_fb_new,
|
||||
.fuse = gm107_fuse_new,
|
||||
.gpio = gk104_gpio_new,
|
||||
.i2c = gm204_i2c_new,
|
||||
.ibus = gm204_ibus_new,
|
||||
.i2c = gm200_i2c_new,
|
||||
.ibus = gm200_ibus_new,
|
||||
.imem = nv50_instmem_new,
|
||||
.ltc = gm204_ltc_new,
|
||||
.ltc = gm200_ltc_new,
|
||||
.mc = gk20a_mc_new,
|
||||
.mmu = gf100_mmu_new,
|
||||
.mxm = nv50_mxm_new,
|
||||
|
|
@ -2013,12 +2013,12 @@ nv124_chipset = {
|
|||
.pmu = gm107_pmu_new,
|
||||
.timer = gk20a_timer_new,
|
||||
.volt = gk104_volt_new,
|
||||
.ce[0] = gm204_ce_new,
|
||||
.ce[1] = gm204_ce_new,
|
||||
.ce[2] = gm204_ce_new,
|
||||
.disp = gm204_disp_new,
|
||||
.ce[0] = gm200_ce_new,
|
||||
.ce[1] = gm200_ce_new,
|
||||
.ce[2] = gm200_ce_new,
|
||||
.disp = gm200_disp_new,
|
||||
.dma = gf119_dma_new,
|
||||
.fifo = gm204_fifo_new,
|
||||
.fifo = gm200_fifo_new,
|
||||
.gr = gm204_gr_new,
|
||||
.sw = gf100_sw_new,
|
||||
};
|
||||
|
|
@ -2029,14 +2029,14 @@ nv126_chipset = {
|
|||
.bar = gf100_bar_new,
|
||||
.bios = nvkm_bios_new,
|
||||
.bus = gf100_bus_new,
|
||||
.devinit = gm204_devinit_new,
|
||||
.devinit = gm200_devinit_new,
|
||||
.fb = gm107_fb_new,
|
||||
.fuse = gm107_fuse_new,
|
||||
.gpio = gk104_gpio_new,
|
||||
.i2c = gm204_i2c_new,
|
||||
.ibus = gm204_ibus_new,
|
||||
.i2c = gm200_i2c_new,
|
||||
.ibus = gm200_ibus_new,
|
||||
.imem = nv50_instmem_new,
|
||||
.ltc = gm204_ltc_new,
|
||||
.ltc = gm200_ltc_new,
|
||||
.mc = gk20a_mc_new,
|
||||
.mmu = gf100_mmu_new,
|
||||
.mxm = nv50_mxm_new,
|
||||
|
|
@ -2044,12 +2044,12 @@ nv126_chipset = {
|
|||
.pmu = gm107_pmu_new,
|
||||
.timer = gk20a_timer_new,
|
||||
.volt = gk104_volt_new,
|
||||
.ce[0] = gm204_ce_new,
|
||||
.ce[1] = gm204_ce_new,
|
||||
.ce[2] = gm204_ce_new,
|
||||
.disp = gm204_disp_new,
|
||||
.ce[0] = gm200_ce_new,
|
||||
.ce[1] = gm200_ce_new,
|
||||
.ce[2] = gm200_ce_new,
|
||||
.disp = gm200_disp_new,
|
||||
.dma = gf119_dma_new,
|
||||
.fifo = gm204_fifo_new,
|
||||
.fifo = gm200_fifo_new,
|
||||
.gr = gm206_gr_new,
|
||||
.sw = gf100_sw_new,
|
||||
};
|
||||
|
|
@ -2063,11 +2063,11 @@ nv12b_chipset = {
|
|||
.fuse = gm107_fuse_new,
|
||||
.ibus = gk20a_ibus_new,
|
||||
.imem = gk20a_instmem_new,
|
||||
.ltc = gm204_ltc_new,
|
||||
.ltc = gm200_ltc_new,
|
||||
.mc = gk20a_mc_new,
|
||||
.mmu = gf100_mmu_new,
|
||||
.timer = gk20a_timer_new,
|
||||
.ce[2] = gm204_ce_new,
|
||||
.ce[2] = gm200_ce_new,
|
||||
.dma = gf119_dma_new,
|
||||
.fifo = gm20b_fifo_new,
|
||||
.gr = gm20b_gr_new,
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ nvkm-y += nvkm/engine/disp/gf119.o
|
|||
nvkm-y += nvkm/engine/disp/gk104.o
|
||||
nvkm-y += nvkm/engine/disp/gk110.o
|
||||
nvkm-y += nvkm/engine/disp/gm107.o
|
||||
nvkm-y += nvkm/engine/disp/gm204.o
|
||||
nvkm-y += nvkm/engine/disp/gm200.o
|
||||
|
||||
nvkm-y += nvkm/engine/disp/outp.o
|
||||
nvkm-y += nvkm/engine/disp/outpdp.o
|
||||
|
|
@ -18,7 +18,7 @@ nvkm-y += nvkm/engine/disp/piornv50.o
|
|||
nvkm-y += nvkm/engine/disp/sornv50.o
|
||||
nvkm-y += nvkm/engine/disp/sorg94.o
|
||||
nvkm-y += nvkm/engine/disp/sorgf119.o
|
||||
nvkm-y += nvkm/engine/disp/sorgm204.o
|
||||
nvkm-y += nvkm/engine/disp/sorgm200.o
|
||||
nvkm-y += nvkm/engine/disp/dport.o
|
||||
|
||||
nvkm-y += nvkm/engine/disp/conn.o
|
||||
|
|
@ -43,7 +43,7 @@ nvkm-y += nvkm/engine/disp/rootgf119.o
|
|||
nvkm-y += nvkm/engine/disp/rootgk104.o
|
||||
nvkm-y += nvkm/engine/disp/rootgk110.o
|
||||
nvkm-y += nvkm/engine/disp/rootgm107.o
|
||||
nvkm-y += nvkm/engine/disp/rootgm204.o
|
||||
nvkm-y += nvkm/engine/disp/rootgm200.o
|
||||
|
||||
nvkm-y += nvkm/engine/disp/channv50.o
|
||||
nvkm-y += nvkm/engine/disp/changf119.o
|
||||
|
|
@ -68,7 +68,7 @@ nvkm-y += nvkm/engine/disp/coregf119.o
|
|||
nvkm-y += nvkm/engine/disp/coregk104.o
|
||||
nvkm-y += nvkm/engine/disp/coregk110.o
|
||||
nvkm-y += nvkm/engine/disp/coregm107.o
|
||||
nvkm-y += nvkm/engine/disp/coregm204.o
|
||||
nvkm-y += nvkm/engine/disp/coregm200.o
|
||||
|
||||
nvkm-y += nvkm/engine/disp/ovlynv50.o
|
||||
nvkm-y += nvkm/engine/disp/ovlyg84.o
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@
|
|||
#include <nvif/class.h>
|
||||
|
||||
const struct nv50_disp_dmac_oclass
|
||||
gm204_disp_core_oclass = {
|
||||
.base.oclass = GM204_DISP_CORE_CHANNEL_DMA,
|
||||
gm200_disp_core_oclass = {
|
||||
.base.oclass = GM200_DISP_CORE_CHANNEL_DMA,
|
||||
.base.minver = 0,
|
||||
.base.maxver = 0,
|
||||
.ctor = nv50_disp_core_new,
|
||||
|
|
@ -87,5 +87,5 @@ extern const struct nv50_disp_dmac_oclass gk110_disp_base_oclass;
|
|||
|
||||
extern const struct nv50_disp_dmac_oclass gm107_disp_core_oclass;
|
||||
|
||||
extern const struct nv50_disp_dmac_oclass gm204_disp_core_oclass;
|
||||
extern const struct nv50_disp_dmac_oclass gm200_disp_core_oclass;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -25,18 +25,18 @@
|
|||
#include "rootnv50.h"
|
||||
|
||||
static const struct nv50_disp_func
|
||||
gm204_disp = {
|
||||
gm200_disp = {
|
||||
.intr = gf119_disp_intr,
|
||||
.uevent = &gf119_disp_chan_uevent,
|
||||
.super = gf119_disp_intr_supervisor,
|
||||
.root = &gm204_disp_root_oclass,
|
||||
.root = &gm200_disp_root_oclass,
|
||||
.head.vblank_init = gf119_disp_vblank_init,
|
||||
.head.vblank_fini = gf119_disp_vblank_fini,
|
||||
.head.scanoutpos = gf119_disp_root_scanoutpos,
|
||||
.outp.internal.crt = nv50_dac_output_new,
|
||||
.outp.internal.tmds = nv50_sor_output_new,
|
||||
.outp.internal.lvds = nv50_sor_output_new,
|
||||
.outp.internal.dp = gm204_sor_dp_new,
|
||||
.outp.internal.dp = gm200_sor_dp_new,
|
||||
.dac.nr = 3,
|
||||
.dac.power = nv50_dac_power,
|
||||
.dac.sense = nv50_dac_sense,
|
||||
|
|
@ -44,11 +44,11 @@ gm204_disp = {
|
|||
.sor.power = nv50_sor_power,
|
||||
.sor.hda_eld = gf119_hda_eld,
|
||||
.sor.hdmi = gk104_hdmi_ctrl,
|
||||
.sor.magic = gm204_sor_magic,
|
||||
.sor.magic = gm200_sor_magic,
|
||||
};
|
||||
|
||||
int
|
||||
gm204_disp_new(struct nvkm_device *device, int index, struct nvkm_disp **pdisp)
|
||||
gm200_disp_new(struct nvkm_device *device, int index, struct nvkm_disp **pdisp)
|
||||
{
|
||||
return gf119_disp_new_(&gm204_disp, device, index, pdisp);
|
||||
return gf119_disp_new_(&gm200_disp, device, index, pdisp);
|
||||
}
|
||||
|
|
@ -42,7 +42,7 @@ int nv50_pior_output_new(struct nvkm_disp *, int, struct dcb_output *,
|
|||
|
||||
u32 g94_sor_dp_lane_map(struct nvkm_device *, u8 lane);
|
||||
|
||||
void gm204_sor_magic(struct nvkm_output *outp);
|
||||
void gm200_sor_magic(struct nvkm_output *outp);
|
||||
|
||||
#define OUTP_MSG(o,l,f,a...) do { \
|
||||
struct nvkm_output *_outp = (o); \
|
||||
|
|
|
|||
|
|
@ -63,6 +63,6 @@ int gf119_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
|
|||
struct nvkm_output **);
|
||||
int gf119_sor_dp_lnk_ctl(struct nvkm_output_dp *, int, int, bool);
|
||||
|
||||
int gm204_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
|
||||
int gm200_sor_dp_new(struct nvkm_disp *, int, struct dcb_output *,
|
||||
struct nvkm_output **);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
#include <nvif/class.h>
|
||||
|
||||
static const struct nv50_disp_root_func
|
||||
gm204_disp_root = {
|
||||
gm200_disp_root = {
|
||||
.init = gf119_disp_root_init,
|
||||
.fini = gf119_disp_root_fini,
|
||||
.dmac = {
|
||||
&gm204_disp_core_oclass,
|
||||
&gm200_disp_core_oclass,
|
||||
&gk110_disp_base_oclass,
|
||||
&gk104_disp_ovly_oclass,
|
||||
},
|
||||
|
|
@ -42,17 +42,17 @@ gm204_disp_root = {
|
|||
};
|
||||
|
||||
static int
|
||||
gm204_disp_root_new(struct nvkm_disp *disp, const struct nvkm_oclass *oclass,
|
||||
gm200_disp_root_new(struct nvkm_disp *disp, const struct nvkm_oclass *oclass,
|
||||
void *data, u32 size, struct nvkm_object **pobject)
|
||||
{
|
||||
return nv50_disp_root_new_(&gm204_disp_root, disp, oclass,
|
||||
return nv50_disp_root_new_(&gm200_disp_root, disp, oclass,
|
||||
data, size, pobject);
|
||||
}
|
||||
|
||||
const struct nvkm_disp_oclass
|
||||
gm204_disp_root_oclass = {
|
||||
.base.oclass = GM204_DISP,
|
||||
gm200_disp_root_oclass = {
|
||||
.base.oclass = GM200_DISP,
|
||||
.base.minver = -1,
|
||||
.base.maxver = -1,
|
||||
.ctor = gm204_disp_root_new,
|
||||
.ctor = gm200_disp_root_new,
|
||||
};
|
||||
|
|
@ -39,5 +39,5 @@ extern const struct nvkm_disp_oclass gf119_disp_root_oclass;
|
|||
extern const struct nvkm_disp_oclass gk104_disp_root_oclass;
|
||||
extern const struct nvkm_disp_oclass gk110_disp_root_oclass;
|
||||
extern const struct nvkm_disp_oclass gm107_disp_root_oclass;
|
||||
extern const struct nvkm_disp_oclass gm204_disp_root_oclass;
|
||||
extern const struct nvkm_disp_oclass gm200_disp_root_oclass;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -27,19 +27,19 @@
|
|||
#include <subdev/timer.h>
|
||||
|
||||
static inline u32
|
||||
gm204_sor_soff(struct nvkm_output_dp *outp)
|
||||
gm200_sor_soff(struct nvkm_output_dp *outp)
|
||||
{
|
||||
return (ffs(outp->base.info.or) - 1) * 0x800;
|
||||
}
|
||||
|
||||
static inline u32
|
||||
gm204_sor_loff(struct nvkm_output_dp *outp)
|
||||
gm200_sor_loff(struct nvkm_output_dp *outp)
|
||||
{
|
||||
return gm204_sor_soff(outp) + !(outp->base.info.sorconf.link & 1) * 0x80;
|
||||
return gm200_sor_soff(outp) + !(outp->base.info.sorconf.link & 1) * 0x80;
|
||||
}
|
||||
|
||||
void
|
||||
gm204_sor_magic(struct nvkm_output *outp)
|
||||
gm200_sor_magic(struct nvkm_output *outp)
|
||||
{
|
||||
struct nvkm_device *device = outp->disp->engine.subdev.device;
|
||||
const u32 soff = outp->or * 0x100;
|
||||
|
|
@ -51,16 +51,16 @@ gm204_sor_magic(struct nvkm_output *outp)
|
|||
}
|
||||
|
||||
static inline u32
|
||||
gm204_sor_dp_lane_map(struct nvkm_device *device, u8 lane)
|
||||
gm200_sor_dp_lane_map(struct nvkm_device *device, u8 lane)
|
||||
{
|
||||
return lane * 0x08;
|
||||
}
|
||||
|
||||
static int
|
||||
gm204_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
|
||||
gm200_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
|
||||
{
|
||||
struct nvkm_device *device = outp->base.disp->engine.subdev.device;
|
||||
const u32 soff = gm204_sor_soff(outp);
|
||||
const u32 soff = gm200_sor_soff(outp);
|
||||
const u32 data = 0x01010101 * pattern;
|
||||
if (outp->base.info.sorconf.link & 1)
|
||||
nvkm_mask(device, 0x61c110 + soff, 0x0f0f0f0f, data);
|
||||
|
|
@ -70,15 +70,15 @@ gm204_sor_dp_pattern(struct nvkm_output_dp *outp, int pattern)
|
|||
}
|
||||
|
||||
static int
|
||||
gm204_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr)
|
||||
gm200_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr)
|
||||
{
|
||||
struct nvkm_device *device = outp->base.disp->engine.subdev.device;
|
||||
const u32 soff = gm204_sor_soff(outp);
|
||||
const u32 loff = gm204_sor_loff(outp);
|
||||
const u32 soff = gm200_sor_soff(outp);
|
||||
const u32 loff = gm200_sor_loff(outp);
|
||||
u32 mask = 0, i;
|
||||
|
||||
for (i = 0; i < nr; i++)
|
||||
mask |= 1 << (gm204_sor_dp_lane_map(device, i) >> 3);
|
||||
mask |= 1 << (gm200_sor_dp_lane_map(device, i) >> 3);
|
||||
|
||||
nvkm_mask(device, 0x61c130 + loff, 0x0000000f, mask);
|
||||
nvkm_mask(device, 0x61c034 + soff, 0x80000000, 0x80000000);
|
||||
|
|
@ -90,13 +90,13 @@ gm204_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr)
|
|||
}
|
||||
|
||||
static int
|
||||
gm204_sor_dp_drv_ctl(struct nvkm_output_dp *outp,
|
||||
gm200_sor_dp_drv_ctl(struct nvkm_output_dp *outp,
|
||||
int ln, int vs, int pe, int pc)
|
||||
{
|
||||
struct nvkm_device *device = outp->base.disp->engine.subdev.device;
|
||||
struct nvkm_bios *bios = device->bios;
|
||||
const u32 shift = gm204_sor_dp_lane_map(device, ln);
|
||||
const u32 loff = gm204_sor_loff(outp);
|
||||
const u32 shift = gm200_sor_dp_lane_map(device, ln);
|
||||
const u32 loff = gm200_sor_loff(outp);
|
||||
u32 addr, data[4];
|
||||
u8 ver, hdr, cnt, len;
|
||||
struct nvbios_dpout info;
|
||||
|
|
@ -128,16 +128,16 @@ gm204_sor_dp_drv_ctl(struct nvkm_output_dp *outp,
|
|||
}
|
||||
|
||||
static const struct nvkm_output_dp_func
|
||||
gm204_sor_dp_func = {
|
||||
.pattern = gm204_sor_dp_pattern,
|
||||
.lnk_pwr = gm204_sor_dp_lnk_pwr,
|
||||
gm200_sor_dp_func = {
|
||||
.pattern = gm200_sor_dp_pattern,
|
||||
.lnk_pwr = gm200_sor_dp_lnk_pwr,
|
||||
.lnk_ctl = gf119_sor_dp_lnk_ctl,
|
||||
.drv_ctl = gm204_sor_dp_drv_ctl,
|
||||
.drv_ctl = gm200_sor_dp_drv_ctl,
|
||||
};
|
||||
|
||||
int
|
||||
gm204_sor_dp_new(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
|
||||
gm200_sor_dp_new(struct nvkm_disp *disp, int index, struct dcb_output *dcbE,
|
||||
struct nvkm_output **poutp)
|
||||
{
|
||||
return nvkm_output_dp_new_(&gm204_sor_dp_func, disp, index, dcbE, poutp);
|
||||
return nvkm_output_dp_new_(&gm200_sor_dp_func, disp, index, dcbE, poutp);
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@ nvkm-y += nvkm/engine/fifo/gf100.o
|
|||
nvkm-y += nvkm/engine/fifo/gk104.o
|
||||
nvkm-y += nvkm/engine/fifo/gk208.o
|
||||
nvkm-y += nvkm/engine/fifo/gk20a.o
|
||||
nvkm-y += nvkm/engine/fifo/gm204.o
|
||||
nvkm-y += nvkm/engine/fifo/gm200.o
|
||||
nvkm-y += nvkm/engine/fifo/gm20b.o
|
||||
|
||||
nvkm-y += nvkm/engine/fifo/chan.o
|
||||
|
|
@ -27,4 +27,4 @@ nvkm-y += nvkm/engine/fifo/gpfifonv50.o
|
|||
nvkm-y += nvkm/engine/fifo/gpfifog84.o
|
||||
nvkm-y += nvkm/engine/fifo/gpfifogf100.o
|
||||
nvkm-y += nvkm/engine/fifo/gpfifogk104.o
|
||||
nvkm-y += nvkm/engine/fifo/gpfifogm204.o
|
||||
nvkm-y += nvkm/engine/fifo/gpfifogm200.o
|
||||
|
|
|
|||
|
|
@ -25,5 +25,5 @@ int gk104_fifo_gpfifo_new(struct nvkm_fifo *, const struct nvkm_oclass *,
|
|||
void *data, u32 size, struct nvkm_object **);
|
||||
|
||||
extern const struct nvkm_fifo_chan_oclass gk104_fifo_gpfifo_oclass;
|
||||
extern const struct nvkm_fifo_chan_oclass gm204_fifo_gpfifo_oclass;
|
||||
extern const struct nvkm_fifo_chan_oclass gm200_fifo_gpfifo_oclass;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#include "changk104.h"
|
||||
|
||||
static const struct nvkm_fifo_func
|
||||
gm204_fifo = {
|
||||
gm200_fifo = {
|
||||
.dtor = gk104_fifo_dtor,
|
||||
.oneinit = gk104_fifo_oneinit,
|
||||
.init = gk104_fifo_init,
|
||||
|
|
@ -34,13 +34,13 @@ gm204_fifo = {
|
|||
.uevent_init = gk104_fifo_uevent_init,
|
||||
.uevent_fini = gk104_fifo_uevent_fini,
|
||||
.chan = {
|
||||
&gm204_fifo_gpfifo_oclass,
|
||||
&gm200_fifo_gpfifo_oclass,
|
||||
NULL
|
||||
},
|
||||
};
|
||||
|
||||
int
|
||||
gm204_fifo_new(struct nvkm_device *device, int index, struct nvkm_fifo **pfifo)
|
||||
gm200_fifo_new(struct nvkm_device *device, int index, struct nvkm_fifo **pfifo)
|
||||
{
|
||||
return gk104_fifo_new_(&gm204_fifo, device, index, 4096, pfifo);
|
||||
return gk104_fifo_new_(&gm200_fifo, device, index, 4096, pfifo);
|
||||
}
|
||||
|
|
@ -32,7 +32,7 @@ gm20b_fifo = {
|
|||
.uevent_init = gk104_fifo_uevent_init,
|
||||
.uevent_fini = gk104_fifo_uevent_fini,
|
||||
.chan = {
|
||||
&gm204_fifo_gpfifo_oclass,
|
||||
&gm200_fifo_gpfifo_oclass,
|
||||
NULL
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include <nvif/class.h>
|
||||
|
||||
const struct nvkm_fifo_chan_oclass
|
||||
gm204_fifo_gpfifo_oclass = {
|
||||
gm200_fifo_gpfifo_oclass = {
|
||||
.base.oclass = MAXWELL_CHANNEL_GPFIFO_A,
|
||||
.base.minver = 0,
|
||||
.base.maxver = 0,
|
||||
|
|
@ -11,4 +11,4 @@ nvkm-y += nvkm/subdev/devinit/gt215.o
|
|||
nvkm-y += nvkm/subdev/devinit/mcp89.o
|
||||
nvkm-y += nvkm/subdev/devinit/gf100.o
|
||||
nvkm-y += nvkm/subdev/devinit/gm107.o
|
||||
nvkm-y += nvkm/subdev/devinit/gm204.o
|
||||
nvkm-y += nvkm/subdev/devinit/gm200.o
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ pmu_load(struct nv50_devinit *init, u8 type, bool post,
|
|||
}
|
||||
|
||||
static int
|
||||
gm204_devinit_post(struct nvkm_devinit *base, bool post)
|
||||
gm200_devinit_post(struct nvkm_devinit *base, bool post)
|
||||
{
|
||||
struct nv50_devinit *init = nv50_devinit(base);
|
||||
struct nvkm_subdev *subdev = &init->base.subdev;
|
||||
|
|
@ -165,17 +165,17 @@ gm204_devinit_post(struct nvkm_devinit *base, bool post)
|
|||
}
|
||||
|
||||
static const struct nvkm_devinit_func
|
||||
gm204_devinit = {
|
||||
gm200_devinit = {
|
||||
.preinit = nv50_devinit_preinit,
|
||||
.init = nv50_devinit_init,
|
||||
.post = gm204_devinit_post,
|
||||
.post = gm200_devinit_post,
|
||||
.pll_set = gf100_devinit_pll_set,
|
||||
.disable = gm107_devinit_disable,
|
||||
};
|
||||
|
||||
int
|
||||
gm204_devinit_new(struct nvkm_device *device, int index,
|
||||
gm200_devinit_new(struct nvkm_device *device, int index,
|
||||
struct nvkm_devinit **pinit)
|
||||
{
|
||||
return nv50_devinit_new_(&gm204_devinit, device, index, pinit);
|
||||
return nv50_devinit_new_(&gm200_devinit, device, index, pinit);
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@ nvkm-y += nvkm/subdev/i2c/g94.o
|
|||
nvkm-y += nvkm/subdev/i2c/gf117.o
|
||||
nvkm-y += nvkm/subdev/i2c/gf119.o
|
||||
nvkm-y += nvkm/subdev/i2c/gk104.o
|
||||
nvkm-y += nvkm/subdev/i2c/gm204.o
|
||||
nvkm-y += nvkm/subdev/i2c/gm200.o
|
||||
|
||||
nvkm-y += nvkm/subdev/i2c/pad.o
|
||||
nvkm-y += nvkm/subdev/i2c/padnv04.o
|
||||
|
|
@ -14,7 +14,7 @@ nvkm-y += nvkm/subdev/i2c/padnv4e.o
|
|||
nvkm-y += nvkm/subdev/i2c/padnv50.o
|
||||
nvkm-y += nvkm/subdev/i2c/padg94.o
|
||||
nvkm-y += nvkm/subdev/i2c/padgf119.o
|
||||
nvkm-y += nvkm/subdev/i2c/padgm204.o
|
||||
nvkm-y += nvkm/subdev/i2c/padgm200.o
|
||||
|
||||
nvkm-y += nvkm/subdev/i2c/bus.o
|
||||
nvkm-y += nvkm/subdev/i2c/busnv04.o
|
||||
|
|
@ -25,6 +25,6 @@ nvkm-y += nvkm/subdev/i2c/bit.o
|
|||
|
||||
nvkm-y += nvkm/subdev/i2c/aux.o
|
||||
nvkm-y += nvkm/subdev/i2c/auxg94.o
|
||||
nvkm-y += nvkm/subdev/i2c/auxgm204.o
|
||||
nvkm-y += nvkm/subdev/i2c/auxgm200.o
|
||||
|
||||
nvkm-y += nvkm/subdev/i2c/anx9805.o
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ int nvkm_i2c_aux_xfer(struct nvkm_i2c_aux *, bool retry, u8 type,
|
|||
u32 addr, u8 *data, u8 size);
|
||||
|
||||
int g94_i2c_aux_new(struct nvkm_i2c_pad *, int, u8, struct nvkm_i2c_aux **);
|
||||
int gm204_i2c_aux_new(struct nvkm_i2c_pad *, int, u8, struct nvkm_i2c_aux **);
|
||||
int gm200_i2c_aux_new(struct nvkm_i2c_pad *, int, u8, struct nvkm_i2c_aux **);
|
||||
|
||||
#define AUX_MSG(b,l,f,a...) do { \
|
||||
struct nvkm_i2c_aux *_aux = (b); \
|
||||
|
|
|
|||
|
|
@ -21,23 +21,23 @@
|
|||
*
|
||||
* Authors: Ben Skeggs <bskeggs@redhat.com>
|
||||
*/
|
||||
#define gm204_i2c_aux(p) container_of((p), struct gm204_i2c_aux, base)
|
||||
#define gm200_i2c_aux(p) container_of((p), struct gm200_i2c_aux, base)
|
||||
#include "aux.h"
|
||||
|
||||
struct gm204_i2c_aux {
|
||||
struct gm200_i2c_aux {
|
||||
struct nvkm_i2c_aux base;
|
||||
int ch;
|
||||
};
|
||||
|
||||
static void
|
||||
gm204_i2c_aux_fini(struct gm204_i2c_aux *aux)
|
||||
gm200_i2c_aux_fini(struct gm200_i2c_aux *aux)
|
||||
{
|
||||
struct nvkm_device *device = aux->base.pad->i2c->subdev.device;
|
||||
nvkm_mask(device, 0x00d954 + (aux->ch * 0x50), 0x00310000, 0x00000000);
|
||||
}
|
||||
|
||||
static int
|
||||
gm204_i2c_aux_init(struct gm204_i2c_aux *aux)
|
||||
gm200_i2c_aux_init(struct gm200_i2c_aux *aux)
|
||||
{
|
||||
struct nvkm_device *device = aux->base.pad->i2c->subdev.device;
|
||||
const u32 unksel = 1; /* nfi which to use, or if it matters.. */
|
||||
|
|
@ -64,7 +64,7 @@ gm204_i2c_aux_init(struct gm204_i2c_aux *aux)
|
|||
udelay(1);
|
||||
if (!timeout--) {
|
||||
AUX_ERR(&aux->base, "magic wait %08x", ctrl);
|
||||
gm204_i2c_aux_fini(aux);
|
||||
gm200_i2c_aux_fini(aux);
|
||||
return -EBUSY;
|
||||
}
|
||||
} while ((ctrl & 0x03000000) != urep);
|
||||
|
|
@ -73,10 +73,10 @@ gm204_i2c_aux_init(struct gm204_i2c_aux *aux)
|
|||
}
|
||||
|
||||
static int
|
||||
gm204_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry,
|
||||
gm200_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry,
|
||||
u8 type, u32 addr, u8 *data, u8 size)
|
||||
{
|
||||
struct gm204_i2c_aux *aux = gm204_i2c_aux(obj);
|
||||
struct gm200_i2c_aux *aux = gm200_i2c_aux(obj);
|
||||
struct nvkm_device *device = aux->base.pad->i2c->subdev.device;
|
||||
const u32 base = aux->ch * 0x50;
|
||||
u32 ctrl, stat, timeout, retries;
|
||||
|
|
@ -85,7 +85,7 @@ gm204_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry,
|
|||
|
||||
AUX_TRACE(&aux->base, "%d: %08x %d", type, addr, size);
|
||||
|
||||
ret = gm204_i2c_aux_init(aux);
|
||||
ret = gm200_i2c_aux_init(aux);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
|
|
@ -155,26 +155,26 @@ gm204_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry,
|
|||
}
|
||||
|
||||
out:
|
||||
gm204_i2c_aux_fini(aux);
|
||||
gm200_i2c_aux_fini(aux);
|
||||
return ret < 0 ? ret : (stat & 0x000f0000) >> 16;
|
||||
}
|
||||
|
||||
static const struct nvkm_i2c_aux_func
|
||||
gm204_i2c_aux_func = {
|
||||
.xfer = gm204_i2c_aux_xfer,
|
||||
gm200_i2c_aux_func = {
|
||||
.xfer = gm200_i2c_aux_xfer,
|
||||
};
|
||||
|
||||
int
|
||||
gm204_i2c_aux_new(struct nvkm_i2c_pad *pad, int index, u8 drive,
|
||||
gm200_i2c_aux_new(struct nvkm_i2c_pad *pad, int index, u8 drive,
|
||||
struct nvkm_i2c_aux **paux)
|
||||
{
|
||||
struct gm204_i2c_aux *aux;
|
||||
struct gm200_i2c_aux *aux;
|
||||
|
||||
if (!(aux = kzalloc(sizeof(*aux), GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
*paux = &aux->base;
|
||||
|
||||
nvkm_i2c_aux_ctor(&gm204_i2c_aux_func, pad, index, &aux->base);
|
||||
nvkm_i2c_aux_ctor(&gm200_i2c_aux_func, pad, index, &aux->base);
|
||||
aux->ch = drive;
|
||||
aux->base.intr = 1 << aux->ch;
|
||||
return 0;
|
||||
|
|
@ -25,16 +25,16 @@
|
|||
#include "pad.h"
|
||||
|
||||
static const struct nvkm_i2c_func
|
||||
gm204_i2c = {
|
||||
gm200_i2c = {
|
||||
.pad_x_new = gf119_i2c_pad_x_new,
|
||||
.pad_s_new = gm204_i2c_pad_s_new,
|
||||
.pad_s_new = gm200_i2c_pad_s_new,
|
||||
.aux = 8,
|
||||
.aux_stat = gk104_aux_stat,
|
||||
.aux_mask = gk104_aux_mask,
|
||||
};
|
||||
|
||||
int
|
||||
gm204_i2c_new(struct nvkm_device *device, int index, struct nvkm_i2c **pi2c)
|
||||
gm200_i2c_new(struct nvkm_device *device, int index, struct nvkm_i2c **pi2c)
|
||||
{
|
||||
return nvkm_i2c_new_(&gm204_i2c, device, index, pi2c);
|
||||
return nvkm_i2c_new_(&gm200_i2c, device, index, pi2c);
|
||||
}
|
||||
|
|
@ -49,11 +49,11 @@ int nv4e_i2c_pad_new(struct nvkm_i2c *, int, struct nvkm_i2c_pad **);
|
|||
int nv50_i2c_pad_new(struct nvkm_i2c *, int, struct nvkm_i2c_pad **);
|
||||
int g94_i2c_pad_x_new(struct nvkm_i2c *, int, struct nvkm_i2c_pad **);
|
||||
int gf119_i2c_pad_x_new(struct nvkm_i2c *, int, struct nvkm_i2c_pad **);
|
||||
int gm204_i2c_pad_x_new(struct nvkm_i2c *, int, struct nvkm_i2c_pad **);
|
||||
int gm200_i2c_pad_x_new(struct nvkm_i2c *, int, struct nvkm_i2c_pad **);
|
||||
|
||||
int g94_i2c_pad_s_new(struct nvkm_i2c *, int, struct nvkm_i2c_pad **);
|
||||
int gf119_i2c_pad_s_new(struct nvkm_i2c *, int, struct nvkm_i2c_pad **);
|
||||
int gm204_i2c_pad_s_new(struct nvkm_i2c *, int, struct nvkm_i2c_pad **);
|
||||
int gm200_i2c_pad_s_new(struct nvkm_i2c *, int, struct nvkm_i2c_pad **);
|
||||
|
||||
int anx9805_pad_new(struct nvkm_i2c_bus *, int, u8, struct nvkm_i2c_pad **);
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include "bus.h"
|
||||
|
||||
static void
|
||||
gm204_i2c_pad_mode(struct nvkm_i2c_pad *pad, enum nvkm_i2c_pad_mode mode)
|
||||
gm200_i2c_pad_mode(struct nvkm_i2c_pad *pad, enum nvkm_i2c_pad_mode mode)
|
||||
{
|
||||
struct nvkm_subdev *subdev = &pad->i2c->subdev;
|
||||
struct nvkm_device *device = subdev->device;
|
||||
|
|
@ -51,26 +51,26 @@ gm204_i2c_pad_mode(struct nvkm_i2c_pad *pad, enum nvkm_i2c_pad_mode mode)
|
|||
}
|
||||
|
||||
static const struct nvkm_i2c_pad_func
|
||||
gm204_i2c_pad_s_func = {
|
||||
gm200_i2c_pad_s_func = {
|
||||
.bus_new_4 = gf119_i2c_bus_new,
|
||||
.aux_new_6 = gm204_i2c_aux_new,
|
||||
.mode = gm204_i2c_pad_mode,
|
||||
.aux_new_6 = gm200_i2c_aux_new,
|
||||
.mode = gm200_i2c_pad_mode,
|
||||
};
|
||||
|
||||
int
|
||||
gm204_i2c_pad_s_new(struct nvkm_i2c *i2c, int id, struct nvkm_i2c_pad **ppad)
|
||||
gm200_i2c_pad_s_new(struct nvkm_i2c *i2c, int id, struct nvkm_i2c_pad **ppad)
|
||||
{
|
||||
return nvkm_i2c_pad_new_(&gm204_i2c_pad_s_func, i2c, id, ppad);
|
||||
return nvkm_i2c_pad_new_(&gm200_i2c_pad_s_func, i2c, id, ppad);
|
||||
}
|
||||
|
||||
static const struct nvkm_i2c_pad_func
|
||||
gm204_i2c_pad_x_func = {
|
||||
gm200_i2c_pad_x_func = {
|
||||
.bus_new_4 = gf119_i2c_bus_new,
|
||||
.aux_new_6 = gm204_i2c_aux_new,
|
||||
.aux_new_6 = gm200_i2c_aux_new,
|
||||
};
|
||||
|
||||
int
|
||||
gm204_i2c_pad_x_new(struct nvkm_i2c *i2c, int id, struct nvkm_i2c_pad **ppad)
|
||||
gm200_i2c_pad_x_new(struct nvkm_i2c *i2c, int id, struct nvkm_i2c_pad **ppad)
|
||||
{
|
||||
return nvkm_i2c_pad_new_(&gm204_i2c_pad_x_func, i2c, id, ppad);
|
||||
return nvkm_i2c_pad_new_(&gm200_i2c_pad_x_func, i2c, id, ppad);
|
||||
}
|
||||
|
|
@ -2,4 +2,4 @@ nvkm-y += nvkm/subdev/ibus/gf100.o
|
|||
nvkm-y += nvkm/subdev/ibus/gf117.o
|
||||
nvkm-y += nvkm/subdev/ibus/gk104.o
|
||||
nvkm-y += nvkm/subdev/ibus/gk20a.o
|
||||
nvkm-y += nvkm/subdev/ibus/gm204.o
|
||||
nvkm-y += nvkm/subdev/ibus/gm200.o
|
||||
|
|
|
|||
|
|
@ -24,17 +24,17 @@
|
|||
#include "priv.h"
|
||||
|
||||
static const struct nvkm_subdev_func
|
||||
gm204_ibus = {
|
||||
gm200_ibus = {
|
||||
.intr = gk104_ibus_intr,
|
||||
};
|
||||
|
||||
int
|
||||
gm204_ibus_new(struct nvkm_device *device, int index,
|
||||
gm200_ibus_new(struct nvkm_device *device, int index,
|
||||
struct nvkm_subdev **pibus)
|
||||
{
|
||||
struct nvkm_subdev *ibus;
|
||||
if (!(ibus = *pibus = kzalloc(sizeof(*ibus), GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
nvkm_subdev_ctor(&gm204_ibus, device, index, 0, ibus);
|
||||
nvkm_subdev_ctor(&gm200_ibus, device, index, 0, ibus);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -2,4 +2,4 @@ nvkm-y += nvkm/subdev/ltc/base.o
|
|||
nvkm-y += nvkm/subdev/ltc/gf100.o
|
||||
nvkm-y += nvkm/subdev/ltc/gk104.o
|
||||
nvkm-y += nvkm/subdev/ltc/gm107.o
|
||||
nvkm-y += nvkm/subdev/ltc/gm204.o
|
||||
nvkm-y += nvkm/subdev/ltc/gm200.o
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#include <subdev/timer.h>
|
||||
|
||||
static int
|
||||
gm204_ltc_oneinit(struct nvkm_ltc *ltc)
|
||||
gm200_ltc_oneinit(struct nvkm_ltc *ltc)
|
||||
{
|
||||
struct nvkm_device *device = ltc->subdev.device;
|
||||
|
||||
|
|
@ -37,15 +37,15 @@ gm204_ltc_oneinit(struct nvkm_ltc *ltc)
|
|||
return gf100_ltc_oneinit_tag_ram(ltc);
|
||||
}
|
||||
static void
|
||||
gm204_ltc_init(struct nvkm_ltc *ltc)
|
||||
gm200_ltc_init(struct nvkm_ltc *ltc)
|
||||
{
|
||||
nvkm_wr32(ltc->subdev.device, 0x17e278, ltc->tag_base);
|
||||
}
|
||||
|
||||
static const struct nvkm_ltc_func
|
||||
gm204_ltc = {
|
||||
.oneinit = gm204_ltc_oneinit,
|
||||
.init = gm204_ltc_init,
|
||||
gm200_ltc = {
|
||||
.oneinit = gm200_ltc_oneinit,
|
||||
.init = gm200_ltc_init,
|
||||
.intr = gm107_ltc_intr, /*XXX: not validated */
|
||||
.cbc_clear = gm107_ltc_cbc_clear,
|
||||
.cbc_wait = gm107_ltc_cbc_wait,
|
||||
|
|
@ -57,7 +57,7 @@ gm204_ltc = {
|
|||
};
|
||||
|
||||
int
|
||||
gm204_ltc_new(struct nvkm_device *device, int index, struct nvkm_ltc **pltc)
|
||||
gm200_ltc_new(struct nvkm_device *device, int index, struct nvkm_ltc **pltc)
|
||||
{
|
||||
return nvkm_ltc_new_(&gm204_ltc, device, index, pltc);
|
||||
return nvkm_ltc_new_(&gm200_ltc, device, index, pltc);
|
||||
}
|
||||
Loading…
Reference in New Issue