diff options
| author | Sean Paul <seanpaul@chromium.org> | 2016-08-24 14:58:26 (GMT) |
|---|---|---|
| committer | Archit Taneja <architt@codeaurora.org> | 2016-09-24 06:26:34 (GMT) |
| commit | 8c77e2c2a48b5d52114fb179c3d7c21fd02be64d (patch) | |
| tree | 33b4e3ed77458bc96ac23be50ff886abb8b45fd3 | |
| parent | 0d97ad03f4220ca84f700c5fea988859ea0c3b98 (diff) | |
| download | linux-8c77e2c2a48b5d52114fb179c3d7c21fd02be64d.tar.xz | |
drm/bridge: analogix_dp: Don't read EDID if panel present
If there's a panel connected to the analogix_dp bridge, rely on
the panel driver for modes, rather than reading EDID *and* calling
get_modes() on the panel.
This allows panels with a valid EDID to read it in the panel driver
(e.g. simple_panel), and panels with invalid EDID to homebrew modes
in their get_modes implementation.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
| -rw-r--r-- | drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 774cc796..e9c9aeb 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -930,15 +930,17 @@ int analogix_dp_get_modes(struct drm_connector *connector) return 0; } - edid = drm_get_edid(connector, &dp->aux.ddc); - if (edid) { - drm_mode_connector_update_edid_property(&dp->connector, edid); - num_modes += drm_add_edid_modes(&dp->connector, edid); - kfree(edid); - } - - if (dp->plat_data->panel) + if (dp->plat_data->panel) { num_modes += drm_panel_get_modes(dp->plat_data->panel); + } else { + edid = drm_get_edid(connector, &dp->aux.ddc); + if (edid) { + drm_mode_connector_update_edid_property(&dp->connector, + edid); + num_modes += drm_add_edid_modes(&dp->connector, edid); + kfree(edid); + } + } if (dp->plat_data->get_modes) num_modes += dp->plat_data->get_modes(dp->plat_data, connector); |