mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	drm/qxl: use generic fbdev emulation
Switch qxl over to the new generic fbdev emulation. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Acked-by: Noralf Trønnes <noralf@tronnes.org> Link: http://patchwork.freedesktop.org/patch/msgid/20190118122020.27596-18-kraxel@redhat.com
This commit is contained in:
		
							parent
							
								
									9b369116fd
								
							
						
					
					
						commit
						26d4707d44
					
				
					 2 changed files with 2 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -1225,18 +1225,11 @@ int qxl_modeset_init(struct qxl_device *qdev)
 | 
			
		|||
	qxl_display_read_client_monitors_config(qdev);
 | 
			
		||||
 | 
			
		||||
	drm_mode_config_reset(&qdev->ddev);
 | 
			
		||||
 | 
			
		||||
	/* primary surface must be created by this point, to allow
 | 
			
		||||
	 * issuing command queue commands and having them read by
 | 
			
		||||
	 * spice server. */
 | 
			
		||||
	qxl_fbdev_init(qdev);
 | 
			
		||||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void qxl_modeset_fini(struct qxl_device *qdev)
 | 
			
		||||
{
 | 
			
		||||
	qxl_fbdev_fini(qdev);
 | 
			
		||||
 | 
			
		||||
	qxl_destroy_monitors_object(qdev);
 | 
			
		||||
	drm_mode_config_cleanup(&qdev->ddev);
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -94,6 +94,8 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 | 
			
		|||
	if (ret)
 | 
			
		||||
		goto modeset_cleanup;
 | 
			
		||||
 | 
			
		||||
	drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "qxl");
 | 
			
		||||
	drm_fbdev_generic_setup(&qdev->ddev, 32);
 | 
			
		||||
	return 0;
 | 
			
		||||
 | 
			
		||||
modeset_cleanup:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue