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

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

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

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

* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: error paths leak in nvc0_graph_construct_context()
  drm/nouveau: Calculate reserved VRAM for PRAMIN value before use.
  drm/nouveau: fix nouveau_vma object leak
  drm/nouveau: fix nouveau_mem object leak
  drm/nouveau: fix fetching vbios from above 4GiB vram addresses
parents c706d7b9 60f7ab06

drivers/gpu/drm/nouveau/nouveau_bios.c

+6 −5
Original line number Diff line number Diff line
@@ -135,13 +135,14 @@ static void load_vbios_pramin(struct drm_device *dev, uint8_t *data) 
	int i;



	if (dev_priv->card_type >= NV_50) {

		uint32_t vbios_vram = (nv_rd32(dev, 0x619f04) & ~0xff) << 8;



		if (!vbios_vram)

			vbios_vram = (nv_rd32(dev, 0x1700) << 16) + 0xf0000;

		u64 addr = (u64)(nv_rd32(dev, 0x619f04) & 0xffffff00) << 8;

		if (!addr) {

			addr  = (u64)nv_rd32(dev, 0x1700) << 16;

			addr += 0xf0000;

		}



		old_bar0_pramin = nv_rd32(dev, 0x1700);

		nv_wr32(dev, 0x1700, vbios_vram >> 16);

		nv_wr32(dev, 0x1700, addr >> 16);

	}



	/* bail if no rom signature */

drivers/gpu/drm/nouveau/nouveau_gem.c

+3 −1
Original line number Diff line number Diff line
@@ -113,8 +113,10 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv) 


	vma = nouveau_bo_vma_find(nvbo, fpriv->vm);

	if (vma) {

		if (--vma->refcount == 0)

		if (--vma->refcount == 0) {

			nouveau_bo_vma_del(nvbo, vma);

			kfree(vma);

		}

	}

	ttm_bo_unreserve(&nvbo->bo);

}

drivers/gpu/drm/nouveau/nouveau_mem.c

+1 −29
Original line number Diff line number Diff line
@@ -423,34 +423,6 @@ nouveau_mem_vram_init(struct drm_device *dev) 
		return ret;

	}



	/* reserve space at end of VRAM for PRAMIN */

	if (dev_priv->card_type >= NV_50) {

		dev_priv->ramin_rsvd_vram = 1 * 1024 * 1024;

	} else

	if (dev_priv->card_type >= NV_40) {

		u32 vs = hweight8((nv_rd32(dev, 0x001540) & 0x0000ff00) >> 8);

		u32 rsvd;



		/* estimate grctx size, the magics come from nv40_grctx.c */

		if      (dev_priv->chipset == 0x40) rsvd = 0x6aa0 * vs;

		else if (dev_priv->chipset  < 0x43) rsvd = 0x4f00 * vs;

		else if (nv44_graph_class(dev))	    rsvd = 0x4980 * vs;

		else				    rsvd = 0x4a40 * vs;

		rsvd += 16 * 1024;

		rsvd *= dev_priv->engine.fifo.channels;



		/* pciegart table */

		if (drm_pci_device_is_pcie(dev))

			rsvd += 512 * 1024;



		/* object storage */

		rsvd += 512 * 1024;



		dev_priv->ramin_rsvd_vram = round_up(rsvd, 4096);

	} else {

		dev_priv->ramin_rsvd_vram = 512 * 1024;

	}



	NV_INFO(dev, "Detected %dMiB VRAM\n", (int)(dev_priv->vram_size >> 20));

	if (dev_priv->vram_sys_base) {

		NV_INFO(dev, "Stolen system memory at: 0x%010llx\n",
@@ -846,8 +818,8 @@ nouveau_gart_manager_del(struct ttm_mem_type_manager *man, 
			 struct ttm_mem_reg *mem)

{

	nouveau_mem_node_cleanup(mem->mm_node);

	mem->mm_node = NULL;

	kfree(mem->mm_node);

	mem->mm_node = NULL;

}



static int

drivers/gpu/drm/nouveau/nv04_instmem.c

+25 −0
Original line number Diff line number Diff line
@@ -28,6 +28,31 @@ int nv04_instmem_init(struct drm_device *dev) 
	/* RAMIN always available */

	dev_priv->ramin_available = true;



	/* Reserve space at end of VRAM for PRAMIN */

	if (dev_priv->card_type >= NV_40) {

		u32 vs = hweight8((nv_rd32(dev, 0x001540) & 0x0000ff00) >> 8);

		u32 rsvd;



		/* estimate grctx size, the magics come from nv40_grctx.c */

		if      (dev_priv->chipset == 0x40) rsvd = 0x6aa0 * vs;

		else if (dev_priv->chipset  < 0x43) rsvd = 0x4f00 * vs;

		else if (nv44_graph_class(dev))	    rsvd = 0x4980 * vs;

		else				    rsvd = 0x4a40 * vs;

		rsvd += 16 * 1024;

		rsvd *= dev_priv->engine.fifo.channels;



		/* pciegart table */

		if (drm_pci_device_is_pcie(dev))

			rsvd += 512 * 1024;



		/* object storage */

		rsvd += 512 * 1024;



		dev_priv->ramin_rsvd_vram = round_up(rsvd, 4096);

	} else {

		dev_priv->ramin_rsvd_vram = 512 * 1024;

	}



	/* Setup shared RAMHT */

	ret = nouveau_gpuobj_new_fake(dev, 0x10000, ~0, 4096,

				      NVOBJ_FLAG_ZERO_ALLOC, &ramht);

drivers/gpu/drm/nouveau/nvc0_graph.c

+12 −10
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ nvc0_graph_construct_context(struct nouveau_channel *chan) 
		if (!nv_wait(dev, 0x409800, 0x80000000, 0x80000000)) {

			NV_ERROR(dev, "PGRAPH: HUB_SET_CHAN timeout\n");

			nvc0_graph_ctxctl_debug(dev);

			return -EBUSY;

			ret = -EBUSY;

			goto err;

		}

	} else {

		nvc0_graph_load_context(chan);
@@ -119,10 +120,8 @@ nvc0_graph_construct_context(struct nouveau_channel *chan) 
	}



	ret = nvc0_grctx_generate(chan);

	if (ret) {

		kfree(ctx);

		return ret;

	}

	if (ret)

		goto err;



	if (!nouveau_ctxfw) {

		nv_wr32(dev, 0x409840, 0x80000000);
@@ -131,14 +130,13 @@ nvc0_graph_construct_context(struct nouveau_channel *chan) 
		if (!nv_wait(dev, 0x409800, 0x80000000, 0x80000000)) {

			NV_ERROR(dev, "PGRAPH: HUB_CTX_SAVE timeout\n");

			nvc0_graph_ctxctl_debug(dev);

			return -EBUSY;

			ret = -EBUSY;

			goto err;

		}

	} else {

		ret = nvc0_graph_unload_context_to(dev, chan->ramin->vinst);

		if (ret) {

			kfree(ctx);

			return ret;

		}

		if (ret)

			goto err;

	}



	for (i = 0; i < priv->grctx_size; i += 4)
@@ -146,6 +144,10 @@ nvc0_graph_construct_context(struct nouveau_channel *chan) 


	priv->grctx_vals = ctx;

	return 0;



err:

	kfree(ctx);

	return ret;

}



static int