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

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

Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes 

* 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
  drm/nouveau: Fix a crash at card takedown for NV40 and older cards
parents 58e73811 7a7b94ad

drivers/gpu/drm/nouveau/nouveau_mem.c

+0 −2
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ nouveau_mem_vram_fini(struct drm_device *dev) 
{

	struct drm_nouveau_private *dev_priv = dev->dev_private;



	nouveau_bo_ref(NULL, &dev_priv->vga_ram);



	ttm_bo_device_release(&dev_priv->ttm.bdev);



	nouveau_ttm_global_release(dev_priv);

drivers/gpu/drm/nouveau/nouveau_state.c

+5 −0
Original line number Diff line number Diff line
@@ -768,6 +768,11 @@ static void nouveau_card_takedown(struct drm_device *dev) 
	engine->mc.takedown(dev);

	engine->display.late_takedown(dev);



	if (dev_priv->vga_ram) {

		nouveau_bo_unpin(dev_priv->vga_ram);

		nouveau_bo_ref(NULL, &dev_priv->vga_ram);

	}



	mutex_lock(&dev->struct_mutex);

	ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_VRAM);

	ttm_bo_clean_mm(&dev_priv->ttm.bdev, TTM_PL_TT);