Rev 4104 | Rev 4280 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4104 | Rev 4126 | ||
|---|---|---|---|
| Line 1409... | Line 1409... | ||
| 1409 | 1409 | ||
| 1410 | dev_priv->num_plane = 1; |
1410 | dev_priv->num_plane = 1; |
| 1411 | if (IS_VALLEYVIEW(dev)) |
1411 | if (IS_VALLEYVIEW(dev)) |
| Line -... | Line 1412... | ||
| - | 1412 | dev_priv->num_plane = 2; |
|
| - | 1413 | ||
| 1412 | dev_priv->num_plane = 2; |
1414 | if (HAS_POWER_WELL(dev)) |
| 1413 | 1415 | i915_init_power_well(dev); |
|
| 1414 | ret = i915_load_modeset_init(dev); |
1416 | ret = i915_load_modeset_init(dev); |
| 1415 | if (ret < 0) { |
1417 | if (ret < 0) { |
| 1416 | DRM_ERROR("failed to init modeset\n"); |
1418 | DRM_ERROR("failed to init modeset\n"); |
| Line -... | Line 1419... | ||
| - | 1419 | goto out_gem_unload; |
|
| 1417 | goto out_gem_unload; |
1420 | } |
| - | 1421 | ||
| - | 1422 | if (INTEL_INFO(dev)->num_pipes) { |
|
| 1418 | } |
1423 | /* Must be done after probing outputs */ |
| Line 1419... | Line 1424... | ||
| 1419 | 1424 | intel_opregion_init(dev); |
|
| 1420 | /* Must be done after probing outputs */ |
1425 | // acpi_video_register(); |
| Line 1421... | Line 1426... | ||
| 1421 | 1426 | } |
|
| Line 1559... | Line 1564... | ||
| 1559 | int i915_driver_open(struct drm_device *dev, struct drm_file *file) |
1564 | int i915_driver_open(struct drm_device *dev, struct drm_file *file) |
| 1560 | { |
1565 | { |
| 1561 | struct drm_i915_file_private *file_priv; |
1566 | struct drm_i915_file_private *file_priv; |
| Line 1562... | Line 1567... | ||
| 1562 | 1567 | ||
| 1563 | DRM_DEBUG_DRIVER("\n"); |
1568 | DRM_DEBUG_DRIVER("\n"); |
| 1564 | file_priv = kmalloc(sizeof(*file_priv), GFP_KERNEL); |
1569 | file_priv = kzalloc(sizeof(*file_priv), GFP_KERNEL); |
| 1565 | if (!file_priv) |
1570 | if (!file_priv) |
| Line 1566... | Line 1571... | ||
| 1566 | return -ENOMEM; |
1571 | return -ENOMEM; |