diff options
| author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:43 -0800 |
|---|---|---|
| committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:43 -0800 |
| commit | ae00c6637cfe613a17953beb99c181360ff379d6 (patch) | |
| tree | 7729f1e4bb7e49f2752a41ab6dedf8d12ccd16f4 /drivers/gpu/drm/i915/display/intel_dp.c | |
| parent | 2b5f745c18b850734e1bb7b7e86510ea69698c71 (diff) | |
| parent | 80dfdeb75028084f42a81a4151a986c56aeec1c1 (diff) | |
Merge remote-tracking branch 'drm-intel/drm-intel-next' into drm-tip
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index b5e2508db1cf..d6d8c9922feb 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4974,6 +4974,14 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, mutex_lock(&dev->mode_config.mutex); edid = drm_get_edid(connector, &intel_dp->aux.ddc); + if (!edid) { + /* Fallback to EDID from ACPI OpRegion, if any */ + edid = intel_opregion_get_edid(intel_connector); + if (edid) + drm_dbg_kms(&dev_priv->drm, + "[CONNECTOR:%d:%s] Using OpRegion EDID\n", + connector->base.id, connector->name); + } if (edid) { if (drm_add_edid_modes(connector, edid)) { drm_connector_update_edid_property(connector, edid); |