.. | .. |
---|
24 | 24 | * DEALINGS IN THE SOFTWARE. |
---|
25 | 25 | */ |
---|
26 | 26 | |
---|
27 | | -#include <drm/drmP.h> |
---|
28 | 27 | #include <drm/drm_crtc_helper.h> |
---|
| 28 | +#include <drm/drm_fourcc.h> |
---|
29 | 29 | |
---|
30 | 30 | #include "nouveau_drv.h" |
---|
31 | 31 | #include "nouveau_reg.h" |
---|
.. | .. |
---|
184 | 184 | struct drm_display_mode *adjusted_mode) |
---|
185 | 185 | { |
---|
186 | 186 | struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); |
---|
187 | | - struct nouveau_connector *nv_connector = nouveau_encoder_connector_get(nv_encoder); |
---|
| 187 | + struct nouveau_connector *nv_connector = |
---|
| 188 | + nv04_encoder_get_connector(nv_encoder); |
---|
188 | 189 | |
---|
189 | 190 | if (!nv_connector->native_mode || |
---|
190 | 191 | nv_connector->scaling_mode == DRM_MODE_SCALE_NONE || |
---|
.. | .. |
---|
478 | 479 | helper->dpms(encoder, DRM_MODE_DPMS_ON); |
---|
479 | 480 | |
---|
480 | 481 | NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n", |
---|
481 | | - nouveau_encoder_connector_get(nv_encoder)->base.name, |
---|
| 482 | + nv04_encoder_get_connector(nv_encoder)->base.name, |
---|
482 | 483 | nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); |
---|
483 | 484 | } |
---|
484 | 485 | |
---|
.. | .. |
---|
591 | 592 | |
---|
592 | 593 | if (nv_encoder->dcb->type == DCB_OUTPUT_LVDS) { |
---|
593 | 594 | struct nouveau_connector *connector = |
---|
594 | | - nouveau_encoder_connector_get(nv_encoder); |
---|
| 595 | + nv04_encoder_get_connector(nv_encoder); |
---|
595 | 596 | |
---|
596 | 597 | if (connector && connector->native_mode) |
---|
597 | 598 | call_lvds_script(dev, nv_encoder->dcb, head, |
---|