Rev 3192 | Rev 5271 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3192 | Rev 3764 | ||
---|---|---|---|
Line 613... | Line 613... | ||
613 | { |
613 | { |
614 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
614 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
615 | struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
615 | struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
616 | enum drm_connector_status ret = connector_status_disconnected; |
616 | enum drm_connector_status ret = connector_status_disconnected; |
Line 617... | Line -... | ||
617 | - | ||
618 | ENTER(); |
- | |
619 | 617 | ||
620 | if (encoder) { |
618 | if (encoder) { |
621 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
619 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
Line 622... | Line 620... | ||
622 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
620 | struct drm_display_mode *native_mode = &radeon_encoder->native_mode; |
Line 639... | Line 637... | ||
639 | } |
637 | } |
640 | } |
638 | } |
641 | /* check acpi lid status ??? */ |
639 | /* check acpi lid status ??? */ |
Line 642... | Line 640... | ||
642 | 640 | ||
643 | radeon_connector_update_scratch_regs(connector, ret); |
- | |
644 | LEAVE(); |
641 | radeon_connector_update_scratch_regs(connector, ret); |
645 | return ret; |
642 | return ret; |
Line 646... | Line 643... | ||
646 | } |
643 | } |
647 | 644 | ||
Line 947... | Line 944... | ||
947 | struct drm_mode_object *obj; |
944 | struct drm_mode_object *obj; |
948 | int i; |
945 | int i; |
949 | enum drm_connector_status ret = connector_status_disconnected; |
946 | enum drm_connector_status ret = connector_status_disconnected; |
950 | bool dret = false, broken_edid = false; |
947 | bool dret = false, broken_edid = false; |
Line 951... | Line -... | ||
951 | - | ||
952 | 948 | ||
953 | if (!force && radeon_check_hpd_status_unchanged(connector)) |
949 | if (!force && radeon_check_hpd_status_unchanged(connector)) |
Line 954... | Line 950... | ||
954 | return connector->status; |
950 | return connector->status; |
955 | 951 | ||
Line 1368... | Line 1364... | ||
1368 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
1364 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
1369 | enum drm_connector_status ret = connector_status_disconnected; |
1365 | enum drm_connector_status ret = connector_status_disconnected; |
1370 | struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; |
1366 | struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv; |
1371 | struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
1367 | struct drm_encoder *encoder = radeon_best_single_encoder(connector); |
Line 1372... | Line -... | ||
1372 | - | ||
1373 | dbgprintf("%s radeon_connector %p encoder %p\n", |
- | |
Line 1374... | Line 1368... | ||
1374 | __FUNCTION__, radeon_connector, encoder); |
1368 | |
1375 | 1369 | ||
1376 | #if DISABLE_DP |
1370 | #if DISABLE_DP |
1377 | connector->status = connector_status_disconnected; |
1371 | connector->status = connector_status_disconnected; |
Line 1399... | Line 1393... | ||
1399 | /* eDP is always DP */ |
1393 | /* eDP is always DP */ |
1400 | radeon_dig_connector->dp_sink_type = CONNECTOR_OBJECT_ID_DISPLAYPORT; |
1394 | radeon_dig_connector->dp_sink_type = CONNECTOR_OBJECT_ID_DISPLAYPORT; |
1401 | if (!radeon_dig_connector->edp_on) |
1395 | if (!radeon_dig_connector->edp_on) |
1402 | atombios_set_edp_panel_power(connector, |
1396 | atombios_set_edp_panel_power(connector, |
1403 | ATOM_TRANSMITTER_ACTION_POWER_ON); |
1397 | ATOM_TRANSMITTER_ACTION_POWER_ON); |
1404 | dbgprintf("check eDP\n"); |
- | |
1405 | if (radeon_dp_getdpcd(radeon_connector)) |
1398 | if (radeon_dp_getdpcd(radeon_connector)) |
1406 | ret = connector_status_connected; |
1399 | ret = connector_status_connected; |
1407 | if (!radeon_dig_connector->edp_on) |
1400 | if (!radeon_dig_connector->edp_on) |
1408 | atombios_set_edp_panel_power(connector, |
1401 | atombios_set_edp_panel_power(connector, |
1409 | ATOM_TRANSMITTER_ACTION_POWER_OFF); |
1402 | ATOM_TRANSMITTER_ACTION_POWER_OFF); |
Line 1442... | Line 1435... | ||
1442 | } |
1435 | } |
1443 | } |
1436 | } |
1444 | } |
1437 | } |
Line 1445... | Line 1438... | ||
1445 | 1438 | ||
1446 | radeon_connector_update_scratch_regs(connector, ret); |
- | |
1447 | LEAVE(); |
1439 | radeon_connector_update_scratch_regs(connector, ret); |
1448 | return ret; |
1440 | return ret; |
Line 1449... | Line 1441... | ||
1449 | } |
1441 | } |
1450 | 1442 | ||
Line 1877... | Line 1869... | ||
1877 | connector->polled = DRM_CONNECTOR_POLL_CONNECT; |
1869 | connector->polled = DRM_CONNECTOR_POLL_CONNECT; |
1878 | } else |
1870 | } else |
1879 | connector->polled = DRM_CONNECTOR_POLL_HPD; |
1871 | connector->polled = DRM_CONNECTOR_POLL_HPD; |
Line 1880... | Line 1872... | ||
1880 | 1872 | ||
1881 | connector->display_info.subpixel_order = subpixel_order; |
1873 | connector->display_info.subpixel_order = subpixel_order; |
1882 | // drm_sysfs_connector_add(connector); |
1874 | drm_sysfs_connector_add(connector); |
Line 1883... | Line 1875... | ||
1883 | return; |
1875 | return; |
1884 | 1876 | ||
1885 | failed: |
1877 | failed: |
Line 2034... | Line 2026... | ||
2034 | if (i2c_bus->valid) |
2026 | if (i2c_bus->valid) |
2035 | connector->polled = DRM_CONNECTOR_POLL_CONNECT; |
2027 | connector->polled = DRM_CONNECTOR_POLL_CONNECT; |
2036 | } else |
2028 | } else |
2037 | connector->polled = DRM_CONNECTOR_POLL_HPD; |
2029 | connector->polled = DRM_CONNECTOR_POLL_HPD; |
2038 | connector->display_info.subpixel_order = subpixel_order; |
2030 | connector->display_info.subpixel_order = subpixel_order; |
2039 | // drm_sysfs_connector_add(connector); |
2031 | drm_sysfs_connector_add(connector); |
2040 | }>>>>>>->>>>>>>>> |
2032 | }>>>>>>->>>>>>>>> |