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

Commit 76f4f415 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

Summary:
- GK110/GK208 acceleration
- loads more work towards pm, though, still behind a disable wall for now
- error reporting improvements from both Ilia and myself
- more old-school overlay improvements from Ilia
- misc other bits and pieces

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (68 commits)
  drm/nouveau: call drm_vblank_cleanup() earlier
  drm/nouveau: create base display from common code
  drm/nv50/gr: print mpc trap name when it's not an mp trap
  drm/nv50/gr: update list of mp errors, make it a bitfield
  drm/nv50/gr: add more trap names to print on error
  drm/nouveau/devinit: lock/unlock crtc regs for all devices, not just pre-nv50
  drm/nouveau: hold mutex while syncing to kernel channel
  drm/nv50-/devinit: prevent use of engines marked as disabled by hw/vbios
  drm/nouveau/device: provide a way for devinit to mark engines as disabled
  drm/nouveau/devinit: tidy up the subdev class definition
  drm/nouveau/bar: tidy up the subdev and object class definitions
  drm/nouveau/instmem: tidy up the object class definition
  drm/nouveau/instmem: tidy up the subdev class definition
  drm/nouveau/pwr: implement a simple i2c stack
  drm/nouveau/pwr: have rd/wr32 routines clobber data instead of addr
  drm/nve0/fb: turn off some bits in 10f584 at init
  drm/nve0/fb/gddr5: merge a fix from ddr3 for one of the timing settings
  drm/nve0/fb/gddr5: yet another random 10f200 bit
  drm/nvc0-/fb: hook up skeleton interrupt handler
  drm/nve0/fb/gddr5: more 10f200 stuff
  ...
parents 2510538f 1139ffb9

drivers/gpu/drm/nouveau/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ nouveau-y += core/subdev/bios/init.o 
nouveau-y += core/subdev/bios/mxm.o

nouveau-y += core/subdev/bios/perf.o

nouveau-y += core/subdev/bios/pll.o

nouveau-y += core/subdev/bios/ramcfg.o

nouveau-y += core/subdev/bios/rammap.o

nouveau-y += core/subdev/bios/timing.o

nouveau-y += core/subdev/bios/therm.o
@@ -71,7 +72,10 @@ nouveau-y += core/subdev/devinit/nv10.o 
nouveau-y += core/subdev/devinit/nv1a.o

nouveau-y += core/subdev/devinit/nv20.o

nouveau-y += core/subdev/devinit/nv50.o

nouveau-y += core/subdev/devinit/nv84.o

nouveau-y += core/subdev/devinit/nv98.o

nouveau-y += core/subdev/devinit/nva3.o

nouveau-y += core/subdev/devinit/nvaf.o

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

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

nouveau-y += core/subdev/fb/nv04.o
@@ -232,6 +236,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/nv108.o

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

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

nouveau-y += core/engine/graph/ctxnvc0.o
@@ -242,6 +247,7 @@ 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/ctxnvf0.o

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

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

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

nouveau-y += core/engine/graph/nv20.o
@@ -260,6 +266,7 @@ 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/nvf0.o

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

nouveau-y += core/engine/mpeg/nv31.o

nouveau-y += core/engine/mpeg/nv40.o

nouveau-y += core/engine/mpeg/nv44.o

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

+18 −5
Original line number Diff line number Diff line
@@ -42,12 +42,25 @@ nouveau_engine_create_(struct nouveau_object *parent, 
	if (ret)

		return ret;



	if ( parent &&

	    !nouveau_boolopt(nv_device(parent)->cfgopt, iname, enable)) {

	if (parent) {

		struct nouveau_device *device = nv_device(parent);

		int engidx = nv_engidx(nv_object(engine));



		if (device->disable_mask & (1ULL << engidx)) {

			if (!nouveau_boolopt(device->cfgopt, iname, false)) {

				nv_debug(engine, "engine disabled by hw/fw\n");

				return -ENODEV;

			}



			nv_warn(engine, "ignoring hw/fw engine disable\n");

		}



		if (!nouveau_boolopt(device->cfgopt, iname, enable)) {

			if (!enable)

				nv_warn(engine, "disabled, %s=1 to enable\n", iname);

			return -ENODEV;

		}

	}



	INIT_LIST_HEAD(&engine->contexts);

	spin_lock_init(&engine->lock);

drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c

+0 −6
Original line number Diff line number Diff line
@@ -105,9 +105,6 @@ nvc0_copy0_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nvc0_copy_priv *priv;

	int ret;



	if (nv_rd32(parent, 0x022500) & 0x00000100)

		return -ENODEV;



	ret = nouveau_falcon_create(parent, engine, oclass, 0x104000, true,

				    "PCE0", "copy0", &priv);

	*pobject = nv_object(priv);
@@ -133,9 +130,6 @@ nvc0_copy1_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nvc0_copy_priv *priv;

	int ret;



	if (nv_rd32(parent, 0x022500) & 0x00000200)

		return -ENODEV;



	ret = nouveau_falcon_create(parent, engine, oclass, 0x105000, true,

				    "PCE1", "copy1", &priv);

	*pobject = nv_object(priv);

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

+0 −6
Original line number Diff line number Diff line
@@ -88,9 +88,6 @@ nve0_copy0_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nve0_copy_priv *priv;

	int ret;



	if (nv_rd32(parent, 0x022500) & 0x00000100)

		return -ENODEV;



	ret = nouveau_engine_create(parent, engine, oclass, true,

				    "PCE0", "copy0", &priv);

	*pobject = nv_object(priv);
@@ -112,9 +109,6 @@ nve0_copy1_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nve0_copy_priv *priv;

	int ret;



	if (nv_rd32(parent, 0x022500) & 0x00000200)

		return -ENODEV;



	ret = nouveau_engine_create(parent, engine, oclass, true,

				    "PCE1", "copy1", &priv);

	*pobject = nv_object(priv);

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

+4 −4
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv04_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv04_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv04_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv04_fifo_oclass;
@@ -67,12 +67,12 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv05_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv05_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv04_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv04_fb_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] =  nv04_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nv04_vmmgr_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv04_fifo_oclass;