Commit 4b223eef authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nvc0: starting point for GF100 support, everything stubbed 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 2d14e35c

drivers/gpu/drm/nouveau/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nouveau_dp.o \

             nv04_timer.o \

             nv04_mc.o nv40_mc.o nv50_mc.o \

             nv04_fb.o nv10_fb.o nv30_fb.o nv40_fb.o nv50_fb.o \

             nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \

             nv04_fb.o nv10_fb.o nv30_fb.o nv40_fb.o nv50_fb.o nvc0_fb.o \

             nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o nvc0_fifo.o \

             nv04_graph.o nv10_graph.o nv20_graph.o \

             nv40_graph.o nv50_graph.o \

             nv40_graph.o nv50_graph.o nvc0_graph.o \

             nv40_grctx.o nv50_grctx.o \

             nv04_instmem.o nv50_instmem.o \

             nv04_instmem.o nv50_instmem.o nvc0_instmem.o \

             nv50_crtc.o nv50_dac.o nv50_sor.o \

             nv50_cursor.o nv50_display.o nv50_fbcon.o \

             nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \

drivers/gpu/drm/nouveau/nouveau_drv.h

+41 −0
Original line number Diff line number Diff line
@@ -509,6 +509,7 @@ enum nouveau_card_type { 
	NV_30      = 0x30,

	NV_40      = 0x40,

	NV_50      = 0x50,

	NV_C0      = 0xc0,

};



struct drm_nouveau_private {
@@ -929,6 +930,10 @@ extern void nv40_fb_set_region_tiling(struct drm_device *, int, uint32_t, 
extern int  nv50_fb_init(struct drm_device *);

extern void nv50_fb_takedown(struct drm_device *);



/* nvc0_fb.c */

extern int  nvc0_fb_init(struct drm_device *);

extern void nvc0_fb_takedown(struct drm_device *);



/* nv04_fifo.c */

extern int  nv04_fifo_init(struct drm_device *);

extern void nv04_fifo_disable(struct drm_device *);
@@ -966,6 +971,20 @@ extern void nv50_fifo_destroy_context(struct nouveau_channel *); 
extern int  nv50_fifo_load_context(struct nouveau_channel *);

extern int  nv50_fifo_unload_context(struct drm_device *);



/* nvc0_fifo.c */

extern int  nvc0_fifo_init(struct drm_device *);

extern void nvc0_fifo_takedown(struct drm_device *);

extern void nvc0_fifo_disable(struct drm_device *);

extern void nvc0_fifo_enable(struct drm_device *);

extern bool nvc0_fifo_reassign(struct drm_device *, bool);

extern bool nvc0_fifo_cache_flush(struct drm_device *);

extern bool nvc0_fifo_cache_pull(struct drm_device *, bool);

extern int  nvc0_fifo_channel_id(struct drm_device *);

extern int  nvc0_fifo_create_context(struct nouveau_channel *);

extern void nvc0_fifo_destroy_context(struct nouveau_channel *);

extern int  nvc0_fifo_load_context(struct nouveau_channel *);

extern int  nvc0_fifo_unload_context(struct drm_device *);



/* nv04_graph.c */

extern struct nouveau_pgraph_object_class nv04_graph_grclass[];

extern int  nv04_graph_init(struct drm_device *);
@@ -1030,6 +1049,16 @@ extern int nv50_graph_unload_context(struct drm_device *); 
extern void nv50_graph_context_switch(struct drm_device *);

extern int  nv50_grctx_init(struct nouveau_grctx *);



/* nvc0_graph.c */

extern int  nvc0_graph_init(struct drm_device *);

extern void nvc0_graph_takedown(struct drm_device *);

extern void nvc0_graph_fifo_access(struct drm_device *, bool);

extern struct nouveau_channel *nvc0_graph_channel(struct drm_device *);

extern int  nvc0_graph_create_context(struct nouveau_channel *);

extern void nvc0_graph_destroy_context(struct nouveau_channel *);

extern int  nvc0_graph_load_context(struct nouveau_channel *);

extern int  nvc0_graph_unload_context(struct drm_device *);



/* nv04_instmem.c */

extern int  nv04_instmem_init(struct drm_device *);

extern void nv04_instmem_takedown(struct drm_device *);
@@ -1056,6 +1085,18 @@ extern void nv50_instmem_flush(struct drm_device *); 
extern void nv84_instmem_flush(struct drm_device *);

extern void nv50_vm_flush(struct drm_device *, int engine);



/* nvc0_instmem.c */

extern int  nvc0_instmem_init(struct drm_device *);

extern void nvc0_instmem_takedown(struct drm_device *);

extern int  nvc0_instmem_suspend(struct drm_device *);

extern void nvc0_instmem_resume(struct drm_device *);

extern int  nvc0_instmem_populate(struct drm_device *, struct nouveau_gpuobj *,

				  uint32_t *size);

extern void nvc0_instmem_clear(struct drm_device *, struct nouveau_gpuobj *);

extern int  nvc0_instmem_bind(struct drm_device *, struct nouveau_gpuobj *);

extern int  nvc0_instmem_unbind(struct drm_device *, struct nouveau_gpuobj *);

extern void nvc0_instmem_flush(struct drm_device *);



/* nv04_mc.c */

extern int  nv04_mc_init(struct drm_device *);

extern void nv04_mc_takedown(struct drm_device *);

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+2 −0
Original line number Diff line number Diff line
@@ -280,6 +280,8 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev, 


	if (dev_priv->channel && !nouveau_nofbaccel) {

		switch (dev_priv->card_type) {

		case NV_C0:

			break;

		case NV_50:

			nv50_fbcon_accel_init(info);

			info->fbops = &nv50_fbcon_ops;

drivers/gpu/drm/nouveau/nouveau_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ nouveau_i2c_init(struct drm_device *dev, struct dcb_i2c_entry *entry, int index) 
	if (entry->chan)

		return -EEXIST;



	if (dev_priv->card_type == NV_50 && entry->read >= NV50_I2C_PORTS) {

	if (dev_priv->card_type == NV_C0 && entry->read >= NV50_I2C_PORTS) {

		NV_ERROR(dev, "unknown i2c port %d\n", entry->read);

		return -EINVAL;

	}

drivers/gpu/drm/nouveau/nouveau_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ nouveau_irq_preinstall(struct drm_device *dev) 
	/* Master disable */

	nv_wr32(dev, NV03_PMC_INTR_EN_0, 0);



	if (dev_priv->card_type == NV_50) {

	if (dev_priv->card_type >= NV_50) {

		INIT_WORK(&dev_priv->irq_work, nv50_display_irq_handler_bh);

		INIT_WORK(&dev_priv->hpd_work, nv50_display_irq_hotplug_bh);

		INIT_LIST_HEAD(&dev_priv->vbl_waiting);