Rev 4280 | Rev 4392 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4280 | Rev 4293 | ||
|---|---|---|---|
| Line 1213... | Line 1213... | ||
| 1213 | return 0; |
1213 | return 0; |
| Line 1214... | Line 1214... | ||
| 1214 | 1214 | ||
| 1215 | cleanup_gem: |
1215 | cleanup_gem: |
| 1216 | mutex_lock(&dev->struct_mutex); |
1216 | mutex_lock(&dev->struct_mutex); |
| - | 1217 | i915_gem_cleanup_ringbuffer(dev); |
|
| 1217 | i915_gem_cleanup_ringbuffer(dev); |
1218 | i915_gem_context_fini(dev); |
| 1218 | mutex_unlock(&dev->struct_mutex); |
1219 | mutex_unlock(&dev->struct_mutex); |
| 1219 | i915_gem_cleanup_aliasing_ppgtt(dev); |
1220 | i915_gem_cleanup_aliasing_ppgtt(dev); |
| 1220 | cleanup_irq: |
1221 | cleanup_irq: |
| 1221 | // drm_irq_uninstall(dev); |
1222 | // drm_irq_uninstall(dev); |
| Line 1419... | Line 1420... | ||
| 1419 | if (IS_VALLEYVIEW(dev)) |
1420 | if (IS_VALLEYVIEW(dev)) |
| 1420 | dev_priv->num_plane = 2; |
1421 | dev_priv->num_plane = 2; |
| Line 1421... | Line 1422... | ||
| 1421 | 1422 | ||
| 1422 | if (HAS_POWER_WELL(dev)) |
1423 | if (HAS_POWER_WELL(dev)) |
| - | 1424 | i915_init_power_well(dev); |
|
| - | 1425 | ||
| 1423 | i915_init_power_well(dev); |
1426 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
| 1424 | ret = i915_load_modeset_init(dev); |
1427 | ret = i915_load_modeset_init(dev); |
| 1425 | if (ret < 0) { |
1428 | if (ret < 0) { |
| 1426 | DRM_ERROR("failed to init modeset\n"); |
1429 | DRM_ERROR("failed to init modeset\n"); |
| 1427 | goto out_gem_unload; |
1430 | goto out_gem_unload; |
| - | 1431 | } |
|
| - | 1432 | } else { |
|
| - | 1433 | /* Start out suspended in ums mode. */ |
|
| - | 1434 | dev_priv->ums.mm_suspended = 1; |
|
| - | 1435 | } |
|
| Line 1428... | Line 1436... | ||
| 1428 | } |
1436 | |
| 1429 | 1437 | ||
| 1430 | if (INTEL_INFO(dev)->num_pipes) { |
1438 | if (INTEL_INFO(dev)->num_pipes) { |
| 1431 | /* Must be done after probing outputs */ |
1439 | /* Must be done after probing outputs */ |