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

Commit 4ac07364 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

This is the main merge request for Nouveau 3.18, overview:
- various bits of roy's gt21x clock work
- various bits of kepler memory clock work (don't get too excited, there's at least one more major bit left that's busting higher freqs)
- misc fan control improvements
- kepler hdmi infoframe fixes
- dp audio
- l2 cache + cbc improvements

* 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (68 commits)
  drm/gt214-/disp: enable dp audio
  drm/gt214-/kms: fix hda eld regression
  drm/g94-/disp: calculate some dp audio constants
  drm/gt214-/kms: perform hda codec setup on displayport too
  drm/gk104-/disp: infoframe registers moved yet again on kepler
  drm/nouveau/bios: parse older ramcfg/timing data like we do newer ones
  drm/nva3/fb/ram: Per-partition regs
  drm/nouveau/fb/ram: Support strided regs
  drm/nv50/fb/ram: Store the number of partitions in the designated fields
  drm/nv50/kms: Set VBLANK time in modeset script
  drm/nouveau/bios: Add rammap support for version 1.0
  drm/gf100-/pwr/memx: block host and fifo around reclock
  drm/nouveau/pwr/memx: fix command ordering around block/unblock
  drm/nouveau/pwr/memx: rename fb off/on to block/unblock
  drm/nva3/clk: Pause the GPU before reclocking
  drm/nouveau/gpio: rename g92 class to g94
  drm/gk104-/fb/ram: move fb enable/disable to same place as nvidia
  drm/gk104/fb/ram: twiddle some more bits when reclocking
  drm/nouveau/bios: parse another large chunk of random memory config data
  drm/gk104-/fb/ram: perform certain steps only when bios data differs
  ...
parents 19524f7c cc2a9071

drivers/gpu/drm/nouveau/Makefile

+11 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ nouveau-y += core/subdev/bios/dcb.o 
nouveau-y += core/subdev/bios/disp.o

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

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/init.o
@@ -51,6 +52,8 @@ 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/M0205.o

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

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

nouveau-y += core/subdev/bus/hwsq.o

nouveau-y += core/subdev/bus/nv04.o
@@ -124,12 +127,17 @@ 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/sddr2.o

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

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

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

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

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

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

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

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

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

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

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

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

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

nouveau-y += core/subdev/i2c/base.o
@@ -190,6 +198,7 @@ nouveau-y += core/subdev/therm/nv50.o 
nouveau-y += core/subdev/therm/nv84.o

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

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

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

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

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

nouveau-y += core/subdev/timer/gk20a.o
@@ -252,6 +261,7 @@ nouveau-y += core/engine/disp/hdanvd0.o 
nouveau-y += core/engine/disp/hdminv84.o

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

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

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

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

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

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

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

+4 −3
Original line number Diff line number Diff line
@@ -91,9 +91,10 @@ nvkm_client_notify_del(struct nouveau_client *client, int index) 
}



int

nvkm_client_notify_new(struct nouveau_client *client,

nvkm_client_notify_new(struct nouveau_object *object,

		       struct nvkm_event *event, void *data, u32 size)

{

	struct nouveau_client *client = nouveau_client(object);

	struct nvkm_client_notify *notify;

	union {

		struct nvif_notify_req_v0 v0;
@@ -127,8 +128,8 @@ nvkm_client_notify_new(struct nouveau_client *client, 
	}



	if (ret == 0) {

		ret = nvkm_notify_init(event, nvkm_client_notify, false,

				       data, size, reply, &notify->n);

		ret = nvkm_notify_init(object, event, nvkm_client_notify,

				       false, data, size, reply, &notify->n);

		if (ret == 0) {

			client->notify[index] = notify;

			notify->client = client;

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 */



#include <core/os.h>

#include <core/object.h>

#include <core/event.h>



void

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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ nouveau_gpuobj_create_(struct nouveau_object *parent, 
	gpuobj->size = size;



	if (heap) {

		ret = nouveau_mm_head(heap, 1, size, size,

		ret = nouveau_mm_head(heap, 0, 1, size, size,

				      max(align, (u32)1), &gpuobj->node);

		if (ret)

			return ret;

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

+1 −2
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ nvkm_ioctl_unmap(struct nouveau_handle *handle, void *data, u32 size) 
static int

nvkm_ioctl_ntfy_new(struct nouveau_handle *handle, void *data, u32 size)

{

	struct nouveau_client *client = nouveau_client(handle->object);

	struct nouveau_object *object = handle->object;

	struct nouveau_ofuncs *ofuncs = object->oclass->ofuncs;

	union {
@@ -365,7 +364,7 @@ nvkm_ioctl_ntfy_new(struct nouveau_handle *handle, void *data, u32 size) 
		if (ret = -ENODEV, ofuncs->ntfy)

			ret = ofuncs->ntfy(object, args->v0.event, &event);

		if (ret == 0) {

			ret = nvkm_client_notify_new(client, event, data, size);

			ret = nvkm_client_notify_new(object, event, data, size);

			if (ret >= 0) {

				args->v0.index = ret;

				ret = 0;