hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2
kernel/drivers/gpu/drm/nouveau/dispnv04/dfp.c
....@@ -24,8 +24,8 @@
2424 * DEALINGS IN THE SOFTWARE.
2525 */
2626
27
-#include <drm/drmP.h>
2827 #include <drm/drm_crtc_helper.h>
28
+#include <drm/drm_fourcc.h>
2929
3030 #include "nouveau_drv.h"
3131 #include "nouveau_reg.h"
....@@ -184,7 +184,8 @@
184184 struct drm_display_mode *adjusted_mode)
185185 {
186186 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);
188189
189190 if (!nv_connector->native_mode ||
190191 nv_connector->scaling_mode == DRM_MODE_SCALE_NONE ||
....@@ -478,7 +479,7 @@
478479 helper->dpms(encoder, DRM_MODE_DPMS_ON);
479480
480481 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,
482483 nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
483484 }
484485
....@@ -591,7 +592,7 @@
591592
592593 if (nv_encoder->dcb->type == DCB_OUTPUT_LVDS) {
593594 struct nouveau_connector *connector =
594
- nouveau_encoder_connector_get(nv_encoder);
595
+ nv04_encoder_get_connector(nv_encoder);
595596
596597 if (connector && connector->native_mode)
597598 call_lvds_script(dev, nv_encoder->dcb, head,