Rev 4280 | Rev 4398 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4280 | Rev 4293 | ||
|---|---|---|---|
| Line 635... | Line 635... | ||
| 635 | 635 | ||
| 636 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
636 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
| 637 | mutex_lock(&dev->struct_mutex); |
637 | mutex_lock(&dev->struct_mutex); |
| 638 | i915_gem_restore_gtt_mappings(dev); |
638 | i915_gem_restore_gtt_mappings(dev); |
| 639 | mutex_unlock(&dev->struct_mutex); |
- | |
| - | 639 | mutex_unlock(&dev->struct_mutex); |
|
| - | 640 | } else if (drm_core_check_feature(dev, DRIVER_MODESET)) |
|
| Line 640... | Line 641... | ||
| 640 | } |
641 | i915_check_and_clear_faults(dev); |
| Line 641... | Line 642... | ||
| 641 | 642 | ||
| 642 | __i915_drm_thaw(dev); |
643 | __i915_drm_thaw(dev); |
| Line 947... | Line 948... | ||
| 947 | 948 | ||
| Line 948... | Line 949... | ||
| 948 | drm_core_init(); |
949 | drm_core_init(); |
| 949 | 950 | ||
| 950 | DRM_INFO("device %x:%x\n", device.pci_dev.vendor, |
- | |
| 951 | device.pci_dev.device); |
- | |
| Line 952... | Line -... | ||
| 952 | /* |
- | |
| 953 | if (intel_info->gen != 3) { |
- | |
| 954 | 951 | DRM_INFO("device %x:%x\n", device.pci_dev.vendor, |
|
| 955 | } else if (init_agp() != 0) { |
- | |
| 956 | DRM_ERROR("drm/i915 can't work without intel_agp module!\n"); |
952 | device.pci_dev.device); |
| 957 | return -ENODEV; |
953 | |
| Line 958... | Line 954... | ||
| 958 | } |
954 | driver.driver_features |= DRIVER_MODESET; |
| 959 | */ |
955 | |