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

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

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

misc fixes for nouveau, one more msi rearm, regression fix for old bioses
crash and leak fixes.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/nouveau/linux-2.6:
  drm/nouveau/nouveau: fix memory leak in nouveau_crtc_page_flip()
  drm/nouveau/bios: fix offset calculation for BMPv1 bioses
  drm/nouveau: return offset of allocated notifier
  drm/nouveau/bios: make jump conditional
  drm/nvce/mc: fix msi rearm on GF114
  drm/nvc0/gr: fix mthd data submission
  drm/nouveau: populate master subdev pointer only when fully constructed
parents a3f28efa bbc63196

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

+0 −3
Original line number Diff line number Diff line
@@ -104,11 +104,8 @@ nouveau_subdev_create_(struct nouveau_object *parent, 


	if (parent) {

		struct nouveau_device *device = nv_device(parent);

		int subidx = nv_hclass(subdev) & 0xff;



		subdev->debug = nouveau_dbgopt(device->dbgopt, subname);

		subdev->mmio  = nv_subdev(device)->mmio;

		device->subdev[subidx] = *pobject;

	}



	return 0;

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

+2 −0
Original line number Diff line number Diff line
@@ -268,6 +268,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent, 
		if (ret)

			return ret;



		device->subdev[i] = devobj->subdev[i];



		/* note: can't init *any* subdevs until devinit has been run

		 * due to not knowing exactly what the vbios init tables will

		 * mess with.  devinit also can't be run until all of its

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

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_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_MC     ] =  nvc0_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;

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

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ nvc0_graph_mthd(struct nvc0_graph_priv *priv, struct nvc0_graph_mthd *mthds) 
	while ((mthd = &mthds[i++]) && (init = mthd->init)) {

		u32  addr = 0x80000000 | mthd->oclass;

		for (data = 0; init->count; init++) {

			if (data != init->data) {

			if (init == mthd->init || data != init->data) {

				nv_wr32(priv, 0x40448c, init->data);

				data = init->data;

			}

drivers/gpu/drm/nouveau/core/include/subdev/fb.h

+5 −0
Original line number Diff line number Diff line
@@ -75,6 +75,11 @@ struct nouveau_fb { 
static inline struct nouveau_fb *

nouveau_fb(void *obj)

{

	/* fbram uses this before device subdev pointer is valid */

	if (nv_iclass(obj, NV_SUBDEV_CLASS) &&

	    nv_subidx(obj) == NVDEV_SUBDEV_FB)

		return obj;



	return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_FB];

}