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

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

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

Various minor fixes all over the place, nothing too scary.

* 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/fbcon/g80: reduce PUSH_SPACE alloc, fire ring on accel init
  drm/nouveau/fbcon/gf100-: reduce RING_SPACE allocation
  drm/nouveau/fbcon/nv11-: correctly account for ring space usage
  drm/nouveau/bios: add proper support for opcode 0x59
  drm/nouveau/bios: add 0x59 and 0x5a opcodes
  drm/nouveau/disp: Use NULL for pointers
  drm/nouveau/pm: fix a potential race condition when creating an engine context
  drm/nouveau/pm: prevent freeing the wrong engine context
  drm/nouveau/gr/gf100: wait for GR idle after GO_IDLE bundle
  drm/nouveau/gr/gf100: wait on bottom half of FE's pipeline
  drm/nouveau/fifo/gk104: kick channels when deactivating them
  drm/nouveau/ibus/gk20a: increase SM wait timeout
  drm/nouveau/platform: fix compile error if !CONFIG_IOMMU
  drm/nouveau: Do not leak client objects
  drm/nouveau/clk/gt215: u32->s32 for difference in req. and set clock
  drm/nouveau/drm/nv04-nv40/instmem: protect access to priv->heap by mutex
  drm/nouveau: hold mutex when calling nouveau_abi16_fini()
parents cbfe8fa6 b7eea2d7

drivers/gpu/drm/nouveau/nouveau_drm.c

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ nouveau_cli_destroy(struct nouveau_cli *cli) 
	nvkm_vm_ref(NULL, &nvxx_client(&cli->base)->vm, NULL);

	nvif_client_fini(&cli->base);

	usif_client_fini(cli);

	kfree(cli);

}



static void
@@ -865,8 +866,10 @@ nouveau_drm_preclose(struct drm_device *dev, struct drm_file *fpriv) 


	pm_runtime_get_sync(dev->dev);



	mutex_lock(&cli->mutex);

	if (cli->abi16)

		nouveau_abi16_fini(cli->abi16);

	mutex_unlock(&cli->mutex);



	mutex_lock(&drm->client.mutex);

	list_del(&cli->head);

drivers/gpu/drm/nouveau/nouveau_platform.c

+16 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ static int nouveau_platform_power_down(struct nouveau_platform_gpu *gpu) 
	return 0;

}



#if IS_ENABLED(CONFIG_IOMMU_API)



static void nouveau_platform_probe_iommu(struct device *dev,

					 struct nouveau_platform_gpu *gpu)

{
@@ -158,6 +160,20 @@ static void nouveau_platform_remove_iommu(struct device *dev, 
	}

}



#else



static void nouveau_platform_probe_iommu(struct device *dev,

					 struct nouveau_platform_gpu *gpu)

{

}



static void nouveau_platform_remove_iommu(struct device *dev,

					  struct nouveau_platform_gpu *gpu)

{

}



#endif



static int nouveau_platform_probe(struct platform_device *pdev)

{

	struct nouveau_platform_gpu *gpu;

drivers/gpu/drm/nouveau/nv04_fbcon.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ nv04_fbcon_accel_init(struct fb_info *info) 
	if (ret)

		return ret;



	if (RING_SPACE(chan, 49)) {

	if (RING_SPACE(chan, 49 + (device->info.chipset >= 0x11 ? 4 : 0))) {

		nouveau_fbcon_gpu_lockup(info);

		return 0;

	}

drivers/gpu/drm/nouveau/nv50_fbcon.c

+2 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ nv50_fbcon_accel_init(struct fb_info *info) 
	if (ret)

		return ret;



	ret = RING_SPACE(chan, 59);

	ret = RING_SPACE(chan, 58);

	if (ret) {

		nouveau_fbcon_gpu_lockup(info);

		return ret;
@@ -252,6 +252,7 @@ nv50_fbcon_accel_init(struct fb_info *info) 
	OUT_RING(chan, info->var.yres_virtual);

	OUT_RING(chan, upper_32_bits(fb->vma.offset));

	OUT_RING(chan, lower_32_bits(fb->vma.offset));

	FIRE_RING(chan);



	return 0;

}

drivers/gpu/drm/nouveau/nvc0_fbcon.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ nvc0_fbcon_accel_init(struct fb_info *info) 
		return -EINVAL;

	}



	ret = RING_SPACE(chan, 60);

	ret = RING_SPACE(chan, 58);

	if (ret) {

		WARN_ON(1);

		nouveau_fbcon_gpu_lockup(info);