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

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

Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes 

some nouveau fixes.

* 'linux-4.14' of git://github.com/skeggsb/linux:
  drm/nouveau/fbcon: fix oops without fbdev emulation
  drm/nouveau/kms/nv50: fix oops during DP IRQ handling on non-MST boards
  drm/nouveau/bsp/g92: disable by default
  drm/nouveau/mmu: flush tlbs before deleting page tables
parents 2de03073 48137663

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+4 −3
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void 
nouveau_fbcon_accel_save_disable(struct drm_device *dev)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	if (drm->fbcon) {

	if (drm->fbcon && drm->fbcon->helper.fbdev) {

		drm->fbcon->saved_flags = drm->fbcon->helper.fbdev->flags;

		drm->fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;

	}
@@ -233,7 +233,7 @@ void 
nouveau_fbcon_accel_restore(struct drm_device *dev)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	if (drm->fbcon) {

	if (drm->fbcon && drm->fbcon->helper.fbdev) {

		drm->fbcon->helper.fbdev->flags = drm->fbcon->saved_flags;

	}

}
@@ -245,6 +245,7 @@ nouveau_fbcon_accel_fini(struct drm_device *dev) 
	struct nouveau_fbdev *fbcon = drm->fbcon;

	if (fbcon && drm->channel) {

		console_lock();

		if (fbcon->helper.fbdev)

			fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;

		console_unlock();

		nouveau_channel_idle(drm->channel);

drivers/gpu/drm/nouveau/nv50_display.c

+4 −1
Original line number Diff line number Diff line
@@ -3265,11 +3265,14 @@ nv50_mstm = { 
void

nv50_mstm_service(struct nv50_mstm *mstm)

{

	struct drm_dp_aux *aux = mstm->mgr.aux;

	struct drm_dp_aux *aux = mstm ? mstm->mgr.aux : NULL;

	bool handled = true;

	int ret;

	u8 esi[8] = {};



	if (!aux)

		return;



	while (handled) {

		ret = drm_dp_dpcd_read(aux, DP_SINK_COUNT_ESI, esi, 8);

		if (ret != 8) {

drivers/gpu/drm/nouveau/nvkm/engine/bsp/g84.c

+1 −1
Original line number Diff line number Diff line
@@ -39,5 +39,5 @@ int 
g84_bsp_new(struct nvkm_device *device, int index, struct nvkm_engine **pengine)

{

	return nvkm_xtensa_new_(&g84_bsp, device, index,

				true, 0x103000, pengine);

				device->chipset != 0x92, 0x103000, pengine);

}

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c

+2 −0
Original line number Diff line number Diff line
@@ -241,6 +241,8 @@ nvkm_vm_unmap_pgt(struct nvkm_vm *vm, int big, u32 fpde, u32 lpde) 
			mmu->func->map_pgt(vpgd->obj, pde, vpgt->mem);

		}



		mmu->func->flush(vm);



		nvkm_memory_del(&pgt);

	}

}