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

Commit 95f158ea authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nv04-nv40: Fix "conflicting memory types" when saving/restoring VGA fonts. 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 9ddc8c52

drivers/gpu/drm/nouveau/nv04_display.c

+3 −4
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ nv04_display_create(struct drm_device *dev) 


	if (nv_two_heads(dev))

		nv04_display_store_initial_head_owner(dev);

	nouveau_hw_save_vga_fonts(dev, 1);



	drm_mode_config_init(dev);

	drm_mode_create_scaling_mode_property(dev);
@@ -203,8 +204,6 @@ nv04_display_create(struct drm_device *dev) 
	/* Save previous state */

	NVLockVgaCrtcs(dev, false);



	nouveau_hw_save_vga_fonts(dev, 1);



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

		crtc->funcs->save(crtc);
@@ -246,9 +245,9 @@ nv04_display_destroy(struct drm_device *dev) 
	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)

		crtc->funcs->restore(crtc);



	nouveau_hw_save_vga_fonts(dev, 0);



	drm_mode_config_cleanup(dev);



	nouveau_hw_save_vga_fonts(dev, 0);

}



void