|
@@ -2688,7 +2688,6 @@ nv50_audio_enable(struct drm_encoder *encoder, struct drm_display_mode *mode)
|
|
if (!drm_detect_monitor_audio(nv_connector->edid))
|
|
if (!drm_detect_monitor_audio(nv_connector->edid))
|
|
return;
|
|
return;
|
|
|
|
|
|
- drm_edid_to_eld(&nv_connector->base, nv_connector->edid);
|
|
|
|
memcpy(args.data, nv_connector->base.eld, sizeof(args.data));
|
|
memcpy(args.data, nv_connector->base.eld, sizeof(args.data));
|
|
|
|
|
|
nvif_mthd(disp->disp, 0, &args,
|
|
nvif_mthd(disp->disp, 0, &args,
|
|
@@ -3064,10 +3063,8 @@ nv50_mstc_get_modes(struct drm_connector *connector)
|
|
|
|
|
|
mstc->edid = drm_dp_mst_get_edid(&mstc->connector, mstc->port->mgr, mstc->port);
|
|
mstc->edid = drm_dp_mst_get_edid(&mstc->connector, mstc->port->mgr, mstc->port);
|
|
drm_mode_connector_update_edid_property(&mstc->connector, mstc->edid);
|
|
drm_mode_connector_update_edid_property(&mstc->connector, mstc->edid);
|
|
- if (mstc->edid) {
|
|
|
|
|
|
+ if (mstc->edid)
|
|
ret = drm_add_edid_modes(&mstc->connector, mstc->edid);
|
|
ret = drm_add_edid_modes(&mstc->connector, mstc->edid);
|
|
- drm_edid_to_eld(&mstc->connector, mstc->edid);
|
|
|
|
- }
|
|
|
|
|
|
|
|
if (!mstc->connector.display_info.bpc)
|
|
if (!mstc->connector.display_info.bpc)
|
|
mstc->connector.display_info.bpc = 8;
|
|
mstc->connector.display_info.bpc = 8;
|