.. | .. |
---|
726 | 726 | #endif |
---|
727 | 727 | |
---|
728 | 728 | nouveau_connector_set_edid(nv_connector, edid); |
---|
729 | | - nouveau_connector_set_encoder(connector, nv_encoder); |
---|
| 729 | + if (nv_encoder) |
---|
| 730 | + nouveau_connector_set_encoder(connector, nv_encoder); |
---|
730 | 731 | return status; |
---|
731 | 732 | } |
---|
732 | 733 | |
---|
.. | .. |
---|
967 | 968 | * "native" mode as some VBIOS tables require us to use the |
---|
968 | 969 | * pixel clock as part of the lookup... |
---|
969 | 970 | */ |
---|
970 | | - if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) |
---|
| 971 | + if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS && nv_connector->native_mode) |
---|
971 | 972 | nouveau_connector_detect_depth(connector); |
---|
972 | 973 | |
---|
973 | 974 | if (nv_encoder->dcb->type == DCB_OUTPUT_TV) |
---|