Rev 1120 | Rev 1125 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1120 | Rev 1123 | ||
|---|---|---|---|
| Line 21... | Line 21... | ||
| 21 | * OTHER DEALINGS IN THE SOFTWARE. |
21 | * OTHER DEALINGS IN THE SOFTWARE. |
| 22 | * |
22 | * |
| 23 | * Authors: Dave Airlie |
23 | * Authors: Dave Airlie |
| 24 | * Alex Deucher |
24 | * Alex Deucher |
| 25 | */ |
25 | */ |
| 26 | //#include "drmP.h" |
26 | #include "drmP.h" |
| 27 | #include "radeon_drm.h" |
27 | #include "radeon_drm.h" |
| 28 | #include "radeon.h" |
28 | #include "radeon.h" |
| Line 29... | Line 29... | ||
| 29 | 29 | ||
| 30 | #include "atom.h" |
30 | #include "atom.h" |
| Line 334... | Line 334... | ||
| 334 | if (enc_obj_num == 2) |
334 | if (enc_obj_num == 2) |
| 335 | linkb = true; |
335 | linkb = true; |
| 336 | else |
336 | else |
| 337 | linkb = false; |
337 | linkb = false; |
| Line 338... | Line 338... | ||
| 338 | 338 | ||
| 339 | // radeon_add_atom_encoder(dev, |
339 | radeon_add_atom_encoder(dev, |
| 340 | // enc_obj_id, |
340 | enc_obj_id, |
| 341 | // le16_to_cpu |
341 | le16_to_cpu |
| 342 | // (path-> |
342 | (path-> |
| Line 343... | Line 343... | ||
| 343 | // usDeviceTag)); |
343 | usDeviceTag)); |
| 344 | 344 | ||
| Line 345... | Line 345... | ||
| 345 | } |
345 | } |
| Line 404... | Line 404... | ||
| 404 | ATOM_DEVICE_CV_SUPPORT)) |
404 | ATOM_DEVICE_CV_SUPPORT)) |
| 405 | ddc_bus.valid = false; |
405 | ddc_bus.valid = false; |
| 406 | else |
406 | else |
| 407 | ddc_bus = radeon_lookup_gpio(dev, line_mux); |
407 | ddc_bus = radeon_lookup_gpio(dev, line_mux); |
| Line 408... | Line 408... | ||
| 408 | 408 | ||
| 409 | // radeon_add_atom_connector(dev, |
409 | radeon_add_atom_connector(dev, |
| 410 | // le16_to_cpu(path-> |
410 | le16_to_cpu(path-> |
| 411 | // usConnObjectId), |
411 | usConnObjectId), |
| 412 | // le16_to_cpu(path-> |
412 | le16_to_cpu(path-> |
| 413 | // usDeviceTag), |
413 | usDeviceTag), |
| 414 | // connector_type, &ddc_bus, |
414 | connector_type, &ddc_bus, |
| Line 415... | Line 415... | ||
| 415 | // linkb, igp_lane_info); |
415 | linkb, igp_lane_info); |
| 416 | 416 | ||
| Line 417... | Line 417... | ||
| 417 | } |
417 | } |
| Line 418... | Line 418... | ||
| 418 | } |
418 | } |
| 419 | 419 | ||
| Line 420... | Line 420... | ||
| 420 | // radeon_link_encoder_connector(dev); |
420 | radeon_link_encoder_connector(dev); |
| Line 530... | Line 530... | ||
| 530 | continue; |
530 | continue; |
| Line 531... | Line 531... | ||
| 531 | 531 | ||
| 532 | bios_connectors[i].valid = true; |
532 | bios_connectors[i].valid = true; |
| Line 533... | Line 533... | ||
| 533 | bios_connectors[i].devices = (1 << i); |
533 | bios_connectors[i].devices = (1 << i); |
| 534 | 534 | ||
| 535 | // if (ASIC_IS_AVIVO(rdev) || radeon_r4xx_atom) |
535 | if (ASIC_IS_AVIVO(rdev) || radeon_r4xx_atom) |
| 536 | // radeon_add_atom_encoder(dev, |
536 | radeon_add_atom_encoder(dev, |
| 537 | // radeon_get_encoder_id(dev, |
537 | radeon_get_encoder_id(dev, |
| 538 | // (1 << i), |
538 | (1 << i), |
| 539 | // dac), |
539 | dac), |
| 540 | // (1 << i)); |
540 | (1 << i)); |
| 541 | // else |
541 | else |
| 542 | // radeon_add_legacy_encoder(dev, |
542 | radeon_add_legacy_encoder(dev, |
| 543 | // radeon_get_encoder_id(dev, |
543 | radeon_get_encoder_id(dev, |
| 544 | // (1 << |
544 | (1 << |
| 545 | // i), |
545 | i), |
| 546 | // dac), |
546 | dac), |
| Line 547... | Line 547... | ||
| 547 | // (1 << i)); |
547 | (1 << i)); |
| 548 | } |
548 | } |
| 549 | 549 | ||
| Line 582... | Line 582... | ||
| 582 | } |
582 | } |
| 583 | } |
583 | } |
| 584 | } |
584 | } |
| Line 585... | Line 585... | ||
| 585 | 585 | ||
| 586 | /* add the connectors */ |
586 | /* add the connectors */ |
| 587 | // for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE; i++) { |
587 | for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE; i++) { |
| 588 | // if (bios_connectors[i].valid) |
588 | if (bios_connectors[i].valid) |
| 589 | // radeon_add_atom_connector(dev, |
589 | radeon_add_atom_connector(dev, |
| 590 | // bios_connectors[i].line_mux, |
590 | bios_connectors[i].line_mux, |
| 591 | // bios_connectors[i].devices, |
591 | bios_connectors[i].devices, |
| 592 | // bios_connectors[i]. |
592 | bios_connectors[i]. |
| 593 | // connector_type, |
593 | connector_type, |
| 594 | // &bios_connectors[i].ddc_bus, |
594 | &bios_connectors[i].ddc_bus, |
| 595 | // false, 0); |
595 | false, 0); |
| Line 596... | Line 596... | ||
| 596 | // } |
596 | } |
| Line 597... | Line 597... | ||
| 597 | 597 | ||
| 598 | // radeon_link_encoder_connector(dev); |
598 | radeon_link_encoder_connector(dev); |
| Line 599... | Line 599... | ||
| 599 | 599 | ||