Rev 6296 | Rev 6937 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6296 | Rev 6660 | ||
|---|---|---|---|
| Line 345... | Line 345... | ||
| 345 | int num_connectors_enabled = 0; |
345 | int num_connectors_enabled = 0; |
| 346 | int num_connectors_detected = 0; |
346 | int num_connectors_detected = 0; |
| 347 | uint64_t conn_configured = 0, mask; |
347 | uint64_t conn_configured = 0, mask; |
| 348 | int pass = 0; |
348 | int pass = 0; |
| Line 349... | Line 349... | ||
| 349 | 349 | ||
| 350 | save_enabled = kcalloc(dev->mode_config.num_connector, sizeof(bool), |
350 | save_enabled = kcalloc(fb_helper->connector_count, sizeof(bool), |
| 351 | GFP_KERNEL); |
351 | GFP_KERNEL); |
| 352 | if (!save_enabled) |
352 | if (!save_enabled) |
| Line 353... | Line 353... | ||
| 353 | return false; |
353 | return false; |
| 354 | 354 | ||
| 355 | memcpy(save_enabled, enabled, dev->mode_config.num_connector); |
355 | memcpy(save_enabled, enabled, fb_helper->connector_count); |
| 356 | mask = (1 << fb_helper->connector_count) - 1; |
356 | mask = (1 << fb_helper->connector_count) - 1; |
| 357 | retry: |
357 | retry: |
| 358 | for (i = 0; i < fb_helper->connector_count; i++) { |
358 | for (i = 0; i < fb_helper->connector_count; i++) { |
| Line 484... | Line 484... | ||
| 484 | } |
484 | } |
| Line 485... | Line 485... | ||
| 485 | 485 | ||
| 486 | if (fallback) { |
486 | if (fallback) { |
| 487 | bail: |
487 | bail: |
| 488 | DRM_DEBUG_KMS("Not using firmware configuration\n"); |
488 | DRM_DEBUG_KMS("Not using firmware configuration\n"); |
| 489 | memcpy(enabled, save_enabled, dev->mode_config.num_connector); |
489 | memcpy(enabled, save_enabled, fb_helper->connector_count); |
| 490 | kfree(save_enabled); |
490 | kfree(save_enabled); |
| 491 | return false; |
491 | return false; |
| Line 492... | Line 492... | ||
| 492 | } |
492 | } |