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

Commit 1a92b7a2 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

- Tegra K1 voltage support, and coherency improvements
- GM204 support (modesetting, still waiting on NVIDIA for signed fw to
proceed further), and a lot of bios/i2c/devinit adjustments needed to
support it
- GT21x memory reclocking work
- Various other bits and pieces, most of which are prep-work for a
couple of bigger projects I didn't get finished in time

* 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (73 commits)
  drm/nv50/kms: drop requirement that framebuffer bos be contig up-front
  drm/nv50/kms: directly use cursor image from userspace buffer
  drm/nouveau/kms: when pinning display-related buffers, force contig vram
  drm/nouveau: teach nouveau_bo_pin() how to force a contig vram allocation
  drm/nouveau/volt: add support for GK20A
  drm/nouveau/platform: add GPU speedo information to nouveau platform
  drm/nouveau/volt: allow non-bios voltage scaling
  drm/gf100-/gr: return non-fatal error code when fw not present
  drm/nouveau/devinit: bump priv ring timeouts before executing scripts
  drm/nouveau/bios: translate ramcfg strap through M0203
  drm/nouveau/fb: make use of M0203 routines for ram type determination
  drm/nouveau/bios: add parsing of BIT M(v2) +0x03 table
  drm/nouveau/core: allow vbios parsing without knowing chipset type
  drm/nouveau/lib: add null backend
  drm/nouveau/device: store revision
  drm/nouveau/core: add some forgotten subdevs to disable mask
  drm/gk20a/clk: fix max VCO value
  drm/nouveau: we need pin_refcnt for nouveau_bo_placement_set()
  drm/nv50-/kms: add some evo tracing ability for debugging
  drm/nv50/kms: use sclass() instead of trial-and-error
  ...
parents 5a52b1f2 9f6d2ce3

drivers/gpu/drm/nouveau/Makefile

+18 −0
Original line number Diff line number Diff line
@@ -41,17 +41,28 @@ nouveau-y += core/subdev/bios/extdev.o 
nouveau-y += core/subdev/bios/fan.o

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

nouveau-y += core/subdev/bios/P0260.o
@@ -86,6 +97,7 @@ 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/devinit/gm107.o

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

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

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

nouveau-y += core/subdev/fb/nv10.o
@@ -129,6 +141,7 @@ nouveau-y += core/subdev/fb/ramgk20a.o 
nouveau-y += core/subdev/fb/ramgm107.o

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

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

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

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

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

nouveau-y += core/subdev/fuse/g80.o
@@ -147,6 +160,7 @@ nouveau-y += core/subdev/i2c/bit.o 
nouveau-y += core/subdev/i2c/pad.o

nouveau-y += core/subdev/i2c/padnv04.o

nouveau-y += core/subdev/i2c/padnv94.o

nouveau-y += core/subdev/i2c/padgm204.o

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

nouveau-y += core/subdev/i2c/nv4e.o

nouveau-y += core/subdev/i2c/nv50.o
@@ -154,6 +168,7 @@ nouveau-y += core/subdev/i2c/nv94.o 
nouveau-y += core/subdev/i2c/nvd0.o

nouveau-y += core/subdev/i2c/gf117.o

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

nouveau-y += core/subdev/i2c/gm204.o

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

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

nouveau-y += core/subdev/ibus/gk20a.o
@@ -211,6 +226,7 @@ nouveau-y += core/subdev/vm/nvc0.o 
nouveau-y += core/subdev/volt/base.o

nouveau-y += core/subdev/volt/gpio.o

nouveau-y += core/subdev/volt/nv40.o

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



nouveau-y += core/engine/falcon.o

nouveau-y += core/engine/xtensa.o
@@ -254,6 +270,7 @@ nouveau-y += core/engine/disp/nvd0.o 
nouveau-y += core/engine/disp/nve0.o

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

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

nouveau-y += core/engine/disp/gm204.o

nouveau-y += core/engine/disp/dacnv50.o

nouveau-y += core/engine/disp/dport.o

nouveau-y += core/engine/disp/hdanva3.o
@@ -266,6 +283,7 @@ nouveau-y += core/engine/disp/piornv50.o 
nouveau-y += core/engine/disp/sornv50.o

nouveau-y += core/engine/disp/sornv94.o

nouveau-y += core/engine/disp/sornvd0.o

nouveau-y += core/engine/disp/sorgm204.o

nouveau-y += core/engine/disp/vga.o

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

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

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

+0 −113
Original line number Diff line number Diff line
@@ -222,116 +222,3 @@ nouveau_handle_put(struct nouveau_handle *handle) 
	if (handle)

		nouveau_namedb_put(handle);

}
 


int

nouveau_handle_new(struct nouveau_object *client, u32 _parent, u32 _handle,

		   u16 _oclass, void *data, u32 size,

		   struct nouveau_object **pobject)

{

	struct nouveau_object *parent = NULL;

	struct nouveau_object *engctx = NULL;

	struct nouveau_object *object = NULL;

	struct nouveau_object *engine;

	struct nouveau_oclass *oclass;

	struct nouveau_handle *handle;

	int ret;



	/* lookup parent object and ensure it *is* a parent */

	parent = nouveau_handle_ref(client, _parent);

	if (!parent) {

		nv_error(client, "parent 0x%08x not found\n", _parent);

		return -ENOENT;

	}



	if (!nv_iclass(parent, NV_PARENT_CLASS)) {

		nv_error(parent, "cannot have children\n");

		ret = -EINVAL;

		goto fail_class;

	}



	/* check that parent supports the requested subclass */

	ret = nouveau_parent_sclass(parent, _oclass, &engine, &oclass);

	if (ret) {

		nv_debug(parent, "illegal class 0x%04x\n", _oclass);

		goto fail_class;

	}



	/* make sure engine init has been completed *before* any objects

	 * it controls are created - the constructors may depend on

	 * state calculated at init (ie. default context construction)

	 */

	if (engine) {

		ret = nouveau_object_inc(engine);

		if (ret)

			goto fail_class;

	}



	/* if engine requires it, create a context object to insert

	 * between the parent and its children (eg. PGRAPH context)

	 */

	if (engine && nv_engine(engine)->cclass) {

		ret = nouveau_object_ctor(parent, engine,

					  nv_engine(engine)->cclass,

					  data, size, &engctx);

		if (ret)

			goto fail_engctx;

	} else {

		nouveau_object_ref(parent, &engctx);

	}



	/* finally, create new object and bind it to its handle */

	ret = nouveau_object_ctor(engctx, engine, oclass, data, size, &object);

	*pobject = object;

	if (ret)

		goto fail_ctor;



	ret = nouveau_object_inc(object);

	if (ret)

		goto fail_init;



	ret = nouveau_handle_create(parent, _parent, _handle, object, &handle);

	if (ret)

		goto fail_handle;



	ret = nouveau_handle_init(handle);

	if (ret)

		nouveau_handle_destroy(handle);



fail_handle:

	nouveau_object_dec(object, false);

fail_init:

	nouveau_object_ref(NULL, &object);

fail_ctor:

	nouveau_object_ref(NULL, &engctx);

fail_engctx:

	if (engine)

		nouveau_object_dec(engine, false);

fail_class:

	nouveau_object_ref(NULL, &parent);

	return ret;

}



int

nouveau_handle_del(struct nouveau_object *client, u32 _parent, u32 _handle)

{

	struct nouveau_object *parent = NULL;

	struct nouveau_object *namedb = NULL;

	struct nouveau_handle *handle = NULL;



	parent = nouveau_handle_ref(client, _parent);

	if (!parent)

		return -ENOENT;



	namedb = nv_pclass(parent, NV_NAMEDB_CLASS);

	if (namedb) {

		handle = nouveau_namedb_get(nv_namedb(namedb), _handle);

		if (handle) {

			nouveau_namedb_put(handle);

			nouveau_handle_fini(handle, false);

			nouveau_handle_destroy(handle);

		}

	}



	nouveau_object_ref(NULL, &parent);

	return handle ? 0 : -EINVAL;

}

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

+12 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <nvif/unpack.h>

#include <nvif/class.h>



#include <subdev/bios.h>

#include <subdev/fb.h>

#include <subdev/instmem.h>
@@ -138,7 +139,7 @@ nouveau_devobj_info(struct nouveau_object *object, void *data, u32 size) 
	}



	args->v0.chipset  = device->chipset;

	args->v0.revision = device->chipset >= 0x10 ? nv_rd32(device, 0) : 0x00;

	args->v0.revision = device->chiprev;

	if (pfb)  args->v0.ram_size = args->v0.ram_user = pfb->ram->size;

	else      args->v0.ram_size = args->v0.ram_user = 0;

	if (imem) args->v0.ram_user = args->v0.ram_user - imem->reserved;
@@ -222,6 +223,7 @@ static const u64 disable_map[] = { 
	[NVDEV_SUBDEV_VOLT]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_THERM]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_PWR]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_FUSE]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_ENGINE_DMAOBJ]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_ENGINE_PERFMON]  = NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_ENGINE_FIFO]	= NV_DEVICE_V0_DISABLE_FIFO,
@@ -235,6 +237,7 @@ static const u64 disable_map[] = { 
	[NVDEV_ENGINE_PPP]	= NV_DEVICE_V0_DISABLE_PPP,

	[NVDEV_ENGINE_COPY0]	= NV_DEVICE_V0_DISABLE_COPY0,

	[NVDEV_ENGINE_COPY1]	= NV_DEVICE_V0_DISABLE_COPY1,

	[NVDEV_ENGINE_COPY2]	= NV_DEVICE_V0_DISABLE_COPY1,

	[NVDEV_ENGINE_VIC]	= NV_DEVICE_V0_DISABLE_VIC,

	[NVDEV_ENGINE_VENC]	= NV_DEVICE_V0_DISABLE_VENC,

	[NVDEV_ENGINE_DISP]	= NV_DEVICE_V0_DISABLE_DISP,
@@ -352,12 +355,14 @@ nouveau_devobj_ctor(struct nouveau_object *parent, 
		/* determine chipset and derive architecture from it */

		if ((boot0 & 0x1f000000) > 0) {

			device->chipset = (boot0 & 0x1ff00000) >> 20;

			device->chiprev = (boot0 & 0x000000ff);

			switch (device->chipset & 0x1f0) {

			case 0x010: {

				if (0x461 & (1 << (device->chipset & 0xf)))

					device->card_type = NV_10;

				else

					device->card_type = NV_11;

				device->chiprev = 0x00;

				break;

			}

			case 0x020: device->card_type = NV_20; break;
@@ -373,7 +378,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent, 
			case 0x0e0:

			case 0x0f0:

			case 0x100: device->card_type = NV_E0; break;

			case 0x110: device->card_type = GM100; break;

			case 0x110:

			case 0x120: device->card_type = GM100; break;

			default:

				break;

			}
@@ -427,6 +433,10 @@ nouveau_devobj_ctor(struct nouveau_object *parent, 
		}



		nv_debug(device, "crystal freq: %dKHz\n", device->crystal);

	} else

	if ( (args->v0.disable & NV_DEVICE_V0_DISABLE_IDENTIFY)) {

		device->cname = "NULL";

		device->oclass[NVDEV_SUBDEV_VBIOS] = &nouveau_bios_oclass;

	}



	if (!(args->v0.disable & NV_DEVICE_V0_DISABLE_MMIO) &&

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

+43 −0
Original line number Diff line number Diff line
@@ -96,6 +96,49 @@ gm100_identify(struct nouveau_device *device) 
		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;

	case 0x124:

		device->cname = "GM204";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gm204_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gm107_fuse_oclass;

#if 0

		/* looks to be some non-trivial changes */

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		/* priv ring says no to 0x10eb14 writes */

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gm107_therm_oclass;

#endif

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  gm204_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  gk20a_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gm107_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gm107_ltc_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    ] =  nv108_pwr_oclass;

#if 0

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;

#endif

		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nvd0_dmaeng_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_FIFO   ] =  nv108_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] =  gm107_graph_oclass;

#endif

		device->oclass[NVDEV_ENGINE_DISP   ] =  gm204_disp_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_COPY0  ] = &gm204_copy0_oclass;

		device->oclass[NVDEV_ENGINE_COPY1  ] = &gm204_copy1_oclass;

		device->oclass[NVDEV_ENGINE_COPY2  ] = &gm204_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;

#endif

		break;

	default:

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

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_ENGINE_GR     ] =  gk20a_graph_oclass;

		device->oclass[NVDEV_ENGINE_COPY2  ] = &nve0_copy2_oclass;

		device->oclass[NVDEV_ENGINE_PERFMON] = &nve0_perfmon_oclass;

		device->oclass[NVDEV_SUBDEV_VOLT   ] = &gk20a_volt_oclass;

		break;

	case 0xf0:

		device->cname = "GK110";