Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Francisco Jerez 2009-12-11 23:44:49 +01:00 committed by Ben Skeggs
parent 9ddc8c52f5
commit 95f158eab4
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gpu/drm/nouveau/nv04_display.c
View file

@ -103,6 +103,7 @@ nv04_display_create(struct drm_device *dev)
if (nv_two_heads(dev)) if (nv_two_heads(dev))
nv04_display_store_initial_head_owner(dev); nv04_display_store_initial_head_owner(dev);
nouveau_hw_save_vga_fonts(dev, 1);
drm_mode_config_init(dev); drm_mode_config_init(dev);
drm_mode_create_scaling_mode_property(dev); drm_mode_create_scaling_mode_property(dev);
@ -203,8 +204,6 @@ nv04_display_create(struct drm_device *dev)
/* Save previous state */ /* Save previous state */
NVLockVgaCrtcs(dev, false); NVLockVgaCrtcs(dev, false);
nouveau_hw_save_vga_fonts(dev, 1);
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
crtc->funcs->save(crtc); 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) list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
crtc->funcs->restore(crtc); crtc->funcs->restore(crtc);
nouveau_hw_save_vga_fonts(dev, 0);
drm_mode_config_cleanup(dev); drm_mode_config_cleanup(dev);
nouveau_hw_save_vga_fonts(dev, 0);
} }
void void