Commit a3a3d479 authored by Dave Airlie's avatar Dave Airlie

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
...@@ -223,7 +223,7 @@ void ...@@ -223,7 +223,7 @@ void
nouveau_fbcon_accel_save_disable(struct drm_device *dev) nouveau_fbcon_accel_save_disable(struct drm_device *dev)
{ {
struct nouveau_drm *drm = nouveau_drm(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->saved_flags = drm->fbcon->helper.fbdev->flags;
drm->fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED; drm->fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;
} }
...@@ -233,7 +233,7 @@ void ...@@ -233,7 +233,7 @@ void
nouveau_fbcon_accel_restore(struct drm_device *dev) nouveau_fbcon_accel_restore(struct drm_device *dev)
{ {
struct nouveau_drm *drm = nouveau_drm(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; drm->fbcon->helper.fbdev->flags = drm->fbcon->saved_flags;
} }
} }
...@@ -245,7 +245,8 @@ nouveau_fbcon_accel_fini(struct drm_device *dev) ...@@ -245,7 +245,8 @@ nouveau_fbcon_accel_fini(struct drm_device *dev)
struct nouveau_fbdev *fbcon = drm->fbcon; struct nouveau_fbdev *fbcon = drm->fbcon;
if (fbcon && drm->channel) { if (fbcon && drm->channel) {
console_lock(); console_lock();
fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED; if (fbcon->helper.fbdev)
fbcon->helper.fbdev->flags |= FBINFO_HWACCEL_DISABLED;
console_unlock(); console_unlock();
nouveau_channel_idle(drm->channel); nouveau_channel_idle(drm->channel);
nvif_object_fini(&fbcon->twod); nvif_object_fini(&fbcon->twod);
......
...@@ -3265,11 +3265,14 @@ nv50_mstm = { ...@@ -3265,11 +3265,14 @@ nv50_mstm = {
void void
nv50_mstm_service(struct nv50_mstm *mstm) 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; bool handled = true;
int ret; int ret;
u8 esi[8] = {}; u8 esi[8] = {};
if (!aux)
return;
while (handled) { while (handled) {
ret = drm_dp_dpcd_read(aux, DP_SINK_COUNT_ESI, esi, 8); ret = drm_dp_dpcd_read(aux, DP_SINK_COUNT_ESI, esi, 8);
if (ret != 8) { if (ret != 8) {
......
...@@ -39,5 +39,5 @@ int ...@@ -39,5 +39,5 @@ int
g84_bsp_new(struct nvkm_device *device, int index, struct nvkm_engine **pengine) g84_bsp_new(struct nvkm_device *device, int index, struct nvkm_engine **pengine)
{ {
return nvkm_xtensa_new_(&g84_bsp, device, index, return nvkm_xtensa_new_(&g84_bsp, device, index,
true, 0x103000, pengine); device->chipset != 0x92, 0x103000, pengine);
} }
...@@ -241,6 +241,8 @@ nvkm_vm_unmap_pgt(struct nvkm_vm *vm, int big, u32 fpde, u32 lpde) ...@@ -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->map_pgt(vpgd->obj, pde, vpgt->mem);
} }
mmu->func->flush(vm);
nvkm_memory_del(&pgt); nvkm_memory_del(&pgt);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment