Rev 3031 | Rev 3120 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3031 | Rev 3037 | ||
|---|---|---|---|
| Line 453... | Line 453... | ||
| 453 | if(!i915_preliminary_hw_support) { |
453 | if(!i915_preliminary_hw_support) { |
| 454 | DRM_ERROR("Preliminary hardware support disabled\n"); |
454 | DRM_ERROR("Preliminary hardware support disabled\n"); |
| 455 | return -ENODEV; |
455 | return -ENODEV; |
| 456 | } |
456 | } |
| Line 457... | Line 457... | ||
| 457 | 457 | ||
| 458 | dbgprintf("device %x:%x\n", device.pci_dev.vendor, |
458 | DRM_INFO("device %x:%x\n", device.pci_dev.vendor, |
| Line 459... | Line 459... | ||
| 459 | device.pci_dev.device); |
459 | device.pci_dev.device); |
| Line 460... | Line 460... | ||
| 460 | 460 | ||
| Line 473... | Line 473... | ||
| 473 | int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent) |
473 | int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent) |
| 474 | { |
474 | { |
| 475 | struct drm_device *dev; |
475 | struct drm_device *dev; |
| 476 | int ret; |
476 | int ret; |
| Line 477... | Line -... | ||
| 477 | - | ||
| 478 | ENTER(); |
- | |
| 479 | 477 | ||
| 480 | dev = kzalloc(sizeof(*dev), 0); |
478 | dev = kzalloc(sizeof(*dev), 0); |
| 481 | if (!dev) |
479 | if (!dev) |
| Line 482... | Line 480... | ||
| 482 | return -ENOMEM; |
480 | return -ENOMEM; |
| Line 513... | Line 511... | ||
| 513 | ret = init_display_kms(dev); |
511 | ret = init_display_kms(dev); |
| Line 514... | Line 512... | ||
| 514 | 512 | ||
| 515 | if (ret) |
513 | if (ret) |
| Line 516... | Line -... | ||
| 516 | goto err_g4; |
- | |
| 517 | - | ||
| 518 | LEAVE(); |
514 | goto err_g4; |
| Line 519... | Line 515... | ||
| 519 | 515 | ||
| 520 | return 0; |
516 | return 0; |
| 521 | 517 | ||
| Line 527... | Line 523... | ||
| 527 | //err_g2: |
523 | //err_g2: |
| 528 | // pci_disable_device(pdev); |
524 | // pci_disable_device(pdev); |
| 529 | //err_g1: |
525 | //err_g1: |
| 530 | free(dev); |
526 | free(dev); |
| Line 531... | Line -... | ||
| 531 | - | ||
| 532 | LEAVE(); |
- | |
| 533 | 527 | ||
| 534 | return ret; |
528 | return ret; |
| Line 535... | Line 529... | ||
| 535 | } |
529 | } |
| 536 | 530 | ||