Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b06c47a1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-nouveau-next' of... 

Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

There's really not a great deal this time due to me spending most of this window on Maxwell.  But, here's the random bits and pieces that's currently queued.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (25 commits)
  drm/gk208/gr: add missing registers to grctx init
  drm/nouveau/kms/nv04-nv40: fix pageflip events via special case.
  drm/nv50-/mc: fix kms pageflip events by reordering irq handling order.
  drm/nouveau/disp/nv04-nv40: abort scanoutpos query on vga analog.
  drm/nv50-/kms: wait for enough ring space in crtc_prepare()
  drm/nouveau/disp/dp: support training pattern 3
  drm/nouveau/disp/dp: support aux read interval during link training
  drm/gk104/gpio: fix incorrect interrupt register usage
  drm/nouveau/core: punt all object state change messages to trace level
  drm/nouveau/clk: allow end-user reclocking for nv40, nvaa, and nve0 clock types
  drm/nouveau/fb: default NvMemExec to on, turning it off is used for debugging only
  drm/nouveau/bios: fix a potential NULL deref in the PROM shadowing function
  drm/nouveau/i2c: bump the i2c delay for the adt7473
  drm/nouveau/therm/fan/tach: default to 2 pulses per revolution
  drm/nvf0/device: enable video decoding engines on gk110/gk208
  drm/nvf1/device: add support for 0xf1 (gk110b)
  drm/nouveau/device: support for probing GK20A
  drm/nouveau/graph: add GK20A support
  drm/nouveau/graph: pad firmware code at load time
  drm/nouveau/graph: enable when using external fw
  ...
parents 5b9adbd3 255b329c

drivers/gpu/drm/nouveau/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ nouveau-y += core/subdev/fb/nvaa.o 
nouveau-y += core/subdev/fb/nvaf.o

nouveau-y += core/subdev/fb/nvc0.o

nouveau-y += core/subdev/fb/nve0.o

nouveau-y += core/subdev/fb/gk20a.o

nouveau-y += core/subdev/fb/gm107.o

nouveau-y += core/subdev/fb/ramnv04.o

nouveau-y += core/subdev/fb/ramnv10.o
@@ -117,6 +118,7 @@ nouveau-y += core/subdev/fb/ramnva3.o 
nouveau-y += core/subdev/fb/ramnvaa.o

nouveau-y += core/subdev/fb/ramnvc0.o

nouveau-y += core/subdev/fb/ramnve0.o

nouveau-y += core/subdev/fb/ramgk20a.o

nouveau-y += core/subdev/fb/ramgm107.o

nouveau-y += core/subdev/fb/sddr3.o

nouveau-y += core/subdev/fb/gddr5.o
@@ -136,6 +138,7 @@ nouveau-y += core/subdev/i2c/nv94.o 
nouveau-y += core/subdev/i2c/nvd0.o

nouveau-y += core/subdev/ibus/nvc0.o

nouveau-y += core/subdev/ibus/nve0.o

nouveau-y += core/subdev/ibus/gk20a.o

nouveau-y += core/subdev/instmem/base.o

nouveau-y += core/subdev/instmem/nv04.o

nouveau-y += core/subdev/instmem/nv40.o
@@ -245,6 +248,7 @@ nouveau-y += core/engine/fifo/nv50.o 
nouveau-y += core/engine/fifo/nv84.o

nouveau-y += core/engine/fifo/nvc0.o

nouveau-y += core/engine/fifo/nve0.o

nouveau-y += core/engine/fifo/gk20a.o

nouveau-y += core/engine/fifo/nv108.o

nouveau-y += core/engine/graph/ctxnv40.o

nouveau-y += core/engine/graph/ctxnv50.o
@@ -255,6 +259,7 @@ nouveau-y += core/engine/graph/ctxnvc8.o 
nouveau-y += core/engine/graph/ctxnvd7.o

nouveau-y += core/engine/graph/ctxnvd9.o

nouveau-y += core/engine/graph/ctxnve4.o

nouveau-y += core/engine/graph/ctxgk20a.o

nouveau-y += core/engine/graph/ctxnvf0.o

nouveau-y += core/engine/graph/ctxnv108.o

nouveau-y += core/engine/graph/ctxgm107.o
@@ -275,6 +280,7 @@ nouveau-y += core/engine/graph/nvc8.o 
nouveau-y += core/engine/graph/nvd7.o

nouveau-y += core/engine/graph/nvd9.o

nouveau-y += core/engine/graph/nve4.o

nouveau-y += core/engine/graph/gk20a.o

nouveau-y += core/engine/graph/nvf0.o

nouveau-y += core/engine/graph/nv108.o

nouveau-y += core/engine/graph/gm107.o

drivers/gpu/drm/nouveau/core/core/object.c

+5 −5
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ nouveau_object_ctor(struct nouveau_object *parent, 
	}



	if (ret == 0) {

		nv_debug(object, "created\n");

		nv_trace(object, "created\n");

		atomic_set(&object->refcount, 1);

	}
@@ -166,7 +166,7 @@ nouveau_object_ctor(struct nouveau_object *parent, 
static void

nouveau_object_dtor(struct nouveau_object *object)

{

	nv_debug(object, "destroying\n");

	nv_trace(object, "destroying\n");

	nv_ofuncs(object)->dtor(object);

}
@@ -337,7 +337,7 @@ nouveau_object_inc(struct nouveau_object *object) 
		goto fail_self;

	}



	nv_debug(object, "initialised\n");

	nv_trace(object, "initialised\n");

	return 0;



fail_self:
@@ -375,7 +375,7 @@ nouveau_object_decf(struct nouveau_object *object) 
	if (object->parent)

		nouveau_object_dec(object->parent, false);



	nv_debug(object, "stopped\n");

	nv_trace(object, "stopped\n");

	return 0;

}
@@ -411,7 +411,7 @@ nouveau_object_decs(struct nouveau_object *object) 
		}

	}



	nv_debug(object, "suspended\n");

	nv_trace(object, "suspended\n");

	return 0;



fail_parent:

drivers/gpu/drm/nouveau/core/engine/device/nve0.c

+50 −4
Original line number Diff line number Diff line
@@ -156,6 +156,23 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] = &nve0_perfmon_oclass;

		break;

	case 0xea:

		device->cname = "GK20A";

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk20a_fb_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk20a_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  gk20a_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gk20a_graph_oclass;

		device->oclass[NVDEV_ENGINE_COPY2  ] = &nve0_copy2_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] = &nve0_perfmon_oclass;

		break;

	case 0xf0:

		device->cname = "GK110";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -184,11 +201,42 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_COPY0  ] = &nve0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nve0_copy1_oclass;

		device->oclass[NVDEV_ENGINE_COPY2  ] = &nve0_copy2_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_BSP    ] = &nve0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;

#endif

		device->oclass[NVDEV_ENGINE_PERFMON] = &nvf0_perfmon_oclass;

		break;

	case 0xf1:

		device->cname = "GK110B";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nvc0_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nve0_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTCG   ] =  gf100_ltcg_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &nve0_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_SUBDEV_PWR    ] = &nvd0_pwr_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  nvf0_graph_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  nvf0_disp_oclass;

		device->oclass[NVDEV_ENGINE_COPY0  ] = &nve0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nve0_copy1_oclass;

		device->oclass[NVDEV_ENGINE_COPY2  ] = &nve0_copy2_oclass;

		device->oclass[NVDEV_ENGINE_BSP    ] = &nve0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] = &nvf0_perfmon_oclass;

		break;

	case 0x108:
@@ -219,11 +267,9 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_COPY0  ] = &nve0_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &nve0_copy1_oclass;

		device->oclass[NVDEV_ENGINE_COPY2  ] = &nve0_copy2_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_BSP    ] = &nve0_bsp_oclass;

		device->oclass[NVDEV_ENGINE_VP     ] = &nve0_vp_oclass;

		device->oclass[NVDEV_ENGINE_PPP    ] = &nvc0_ppp_oclass;

#endif

		break;

	default:

		nv_fatal(device, "unknown Kepler chipset\n");

drivers/gpu/drm/nouveau/core/engine/disp/dport.c

+12 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct dp_state { 
	u8 version;

	struct nouveau_i2c_port *aux;

	int head;

	u8  dpcd[4];

	u8  dpcd[16];

	int link_nr;

	u32 link_bw;

	u8  stat[6];
@@ -149,6 +149,9 @@ dp_link_train_update(struct dp_state *dp, u32 delay) 
{

	int ret;



	if (dp->dpcd[DPCD_RC0E_AUX_RD_INTERVAL])

		mdelay(dp->dpcd[DPCD_RC0E_AUX_RD_INTERVAL] * 4);

	else

		udelay(delay);



	ret = nv_rdaux(dp->aux, DPCD_LS02, dp->stat, 6);
@@ -199,6 +202,9 @@ dp_link_train_eq(struct dp_state *dp) 
	bool eq_done = false, cr_done = true;

	int tries = 0, i;



	if (dp->dpcd[2] & DPCD_RC02_TPS3_SUPPORTED)

		dp_set_training_pattern(dp, 3);

	else

		dp_set_training_pattern(dp, 2);



	do {
@@ -313,8 +319,10 @@ nouveau_dp_train(struct nouveau_disp *disp, const struct nouveau_dp_func *func, 
	}



	/* bring capabilities within encoder limits */

	if (nv_oclass(disp)->handle < NV_ENGINE(DISP, 0x90))

		dp->dpcd[2] &= ~DPCD_RC02_TPS3_SUPPORTED;

	if ((dp->dpcd[2] & 0x1f) > dp->outp->dpconf.link_nr) {

		dp->dpcd[2] &= ~0x1f;

		dp->dpcd[2] &= ~DPCD_RC02_MAX_LANE_COUNT;

		dp->dpcd[2] |= dp->outp->dpconf.link_nr;

	}

	if (dp->dpcd[1] > dp->outp->dpconf.link_bw)

drivers/gpu/drm/nouveau/core/engine/disp/dport.h

+4 −4
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ 
#define __NVKM_DISP_DPORT_H__



/* DPCD Receiver Capabilities */

#define DPCD_RC00                                                       0x00000

#define DPCD_RC00_DPCD_REV                                                 0xff

#define DPCD_RC01                                                       0x00001

#define DPCD_RC01_MAX_LINK_RATE                                            0xff

#define DPCD_RC00_DPCD_REV                                              0x00000

#define DPCD_RC01_MAX_LINK_RATE                                         0x00001

#define DPCD_RC02                                                       0x00002

#define DPCD_RC02_ENHANCED_FRAME_CAP                                       0x80

#define DPCD_RC02_TPS3_SUPPORTED                                           0x40

#define DPCD_RC02_MAX_LANE_COUNT                                           0x1f

#define DPCD_RC03                                                       0x00003

#define DPCD_RC03_MAX_DOWNSPREAD                                           0x01

#define DPCD_RC0E_AUX_RD_INTERVAL                                       0x0000e



/* DPCD Link Configuration */

#define DPCD_LC00                                                       0x00100