Rev 3764 | Rev 4104 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3764 | Rev 4075 | ||
|---|---|---|---|
| Line 187... | Line 187... | ||
| 187 | drm_mode_prune_invalid(dev, &connector->modes, verbose_prune); |
187 | drm_mode_prune_invalid(dev, &connector->modes, verbose_prune); |
| Line 188... | Line 188... | ||
| 188 | 188 | ||
| 189 | if (list_empty(&connector->modes)) |
189 | if (list_empty(&connector->modes)) |
| Line -... | Line 190... | ||
| - | 190 | return 0; |
|
| - | 191 | ||
| - | 192 | list_for_each_entry(mode, &connector->modes, head) |
|
| 190 | return 0; |
193 | mode->vrefresh = drm_mode_vrefresh(mode); |
| Line 191... | Line 194... | ||
| 191 | 194 | ||
| 192 | drm_mode_sort(&connector->modes); |
195 | drm_mode_sort(&connector->modes); |
| 193 | 196 | ||
| 194 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s] probed modes :\n", connector->base.id, |
- | |
| 195 | drm_get_connector_name(connector)); |
- | |
| 196 | list_for_each_entry(mode, &connector->modes, head) { |
197 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s] probed modes :\n", connector->base.id, |
| 197 | mode->vrefresh = drm_mode_vrefresh(mode); |
198 | drm_get_connector_name(connector)); |
| 198 | 199 | list_for_each_entry(mode, &connector->modes, head) { |
|
| Line 199... | Line 200... | ||
| 199 | drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V); |
200 | drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V); |
| Line 562... | Line 563... | ||
| 562 | int ret; |
563 | int ret; |
| 563 | int i; |
564 | int i; |
| Line 564... | Line 565... | ||
| 564 | 565 | ||
| Line 565... | Line 566... | ||
| 565 | DRM_DEBUG_KMS("\n"); |
566 | DRM_DEBUG_KMS("\n"); |
| 566 | - | ||
| 567 | if (!set) |
- | |
| 568 | return -EINVAL; |
567 | |
| 569 | 568 | BUG_ON(!set); |
|
| 570 | if (!set->crtc) |
569 | BUG_ON(!set->crtc); |
| - | 570 | BUG_ON(!set->crtc->helper_private); |
|
| 571 | return -EINVAL; |
571 | |
| 572 | 572 | /* Enforce sane interface api - has been abused by the fb helper. */ |
|
| Line 573... | Line 573... | ||
| 573 | if (!set->crtc->helper_private) |
573 | BUG_ON(!set->mode && set->fb); |
| Line 574... | Line 574... | ||
| 574 | return -EINVAL; |
574 | BUG_ON(set->fb && set->num_connectors == 0); |
| 575 | 575 | ||
| Line 643... | Line 643... | ||
| 643 | if (set->crtc->fb == NULL) { |
643 | if (set->crtc->fb == NULL) { |
| 644 | DRM_DEBUG_KMS("crtc has no fb, full mode set\n"); |
644 | DRM_DEBUG_KMS("crtc has no fb, full mode set\n"); |
| 645 | mode_changed = true; |
645 | mode_changed = true; |
| 646 | } else if (set->fb == NULL) { |
646 | } else if (set->fb == NULL) { |
| 647 | mode_changed = true; |
647 | mode_changed = true; |
| 648 | } else if (set->fb->depth != set->crtc->fb->depth) { |
- | |
| 649 | mode_changed = true; |
- | |
| 650 | } else if (set->fb->bits_per_pixel != |
- | |
| 651 | set->crtc->fb->bits_per_pixel) { |
- | |
| 652 | mode_changed = true; |
- | |
| 653 | } else if (set->fb->pixel_format != |
648 | } else if (set->fb->pixel_format != |
| 654 | set->crtc->fb->pixel_format) { |
649 | set->crtc->fb->pixel_format) { |
| 655 | mode_changed = true; |
650 | mode_changed = true; |
| 656 | } else |
651 | } else |
| 657 | fb_changed = true; |
652 | fb_changed = true; |
| Line 680... | Line 675... | ||
| 680 | we are setting now - then fail */ |
675 | we are setting now - then fail */ |
| 681 | if (new_encoder == NULL) |
676 | if (new_encoder == NULL) |
| 682 | /* don't break so fail path works correct */ |
677 | /* don't break so fail path works correct */ |
| 683 | fail = 1; |
678 | fail = 1; |
| 684 | break; |
679 | break; |
| - | 680 | ||
| - | 681 | if (connector->dpms != DRM_MODE_DPMS_ON) { |
|
| - | 682 | DRM_DEBUG_KMS("connector dpms not on, full mode switch\n"); |
|
| - | 683 | mode_changed = true; |
|
| - | 684 | } |
|
| 685 | } |
685 | } |
| 686 | } |
686 | } |
| Line 687... | Line 687... | ||
| 687 | 687 | ||
| 688 | if (new_encoder != connector->encoder) { |
688 | if (new_encoder != connector->encoder) { |