Subversion Repositories Kolibri OS

Rev

Rev 6084 | Rev 6103 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6084 Rev 6088
Line 850... Line 850...
850 
 
 850 
 
851 
	ret = i915_gem_gtt_init(dev);
 851 
	ret = i915_gem_gtt_init(dev);
852 
	if (ret)
 852 
	if (ret)
Line -... Line 853...
- 
 
 853 
		goto out_freecsr;
- 
 
 854 
 
- 
 
 855 
	/* WARNING: Apparently we must kick fbdev drivers before vgacon,
- 
 
 856 
	 * otherwise the vga fbdev driver falls over. */
- 
 
 857 
	ret = i915_kick_out_firmware_fb(dev_priv);
- 
 
 858 
	if (ret) {
- 
 
 859 
		DRM_ERROR("failed to remove conflicting framebuffer drivers\n");
- 
 
 860 
		goto out_gtt;
853 
		goto out_freecsr;
 861 
	}
854 
 
 862 
 
855 
	ret = i915_kick_out_vgacon(dev_priv);
 863 
	ret = i915_kick_out_vgacon(dev_priv);
856 
	if (ret) {
 864 
	if (ret) {
857 
		DRM_ERROR("failed to remove conflicting VGA console\n");
 865 
		DRM_ERROR("failed to remove conflicting VGA console\n");
Line 925... Line 933...
925 
 
 933 
 
Line 926... Line 934...
926 
	intel_device_info_runtime_init(dev);
 934 
	intel_device_info_runtime_init(dev);
Line 927... Line 935...
927 
 
 935 
 
928 
	intel_init_dpio(dev_priv);
 936 
	intel_init_dpio(dev_priv);
929 
 
 937 
 
930 
//   if (INTEL_INFO(dev)->num_pipes) {
 938 
	if (INTEL_INFO(dev)->num_pipes) {
931 
//       ret = drm_vblank_init(dev, INTEL_INFO(dev)->num_pipes);
 939 
		ret = drm_vblank_init(dev, INTEL_INFO(dev)->num_pipes);
Line 932... Line 940...
932 
//       if (ret)
 940 
		if (ret)
Line 933... Line 941...
933 
//           goto out_gem_unload;
 941 
			goto out_gem_unload;
934 
//   }
 942 
	}