diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-25 14:55:30 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-25 14:55:29 -0700 |
| commit | 5744bfc669c2e92fa04fff34e1c38702e03affd8 (patch) | |
| tree | 410e240828df265206a7092da73615e9ddc7e516 | |
| parent | bef923715ee90aba1209b28c3ca9cf523f9537cc (diff) | |
| parent | 7887be217f95f0c31e06eae4239391b7e9534af4 (diff) | |
Merge "drm: probe_helper: Hide ugly ifdef"
| -rw-r--r-- | drivers/gpu/drm/drm_probe_helper.c | 2 | ||||
| -rw-r--r-- | include/drm/drm_edid.h | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index b7383f53358c..378194f6a28d 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -205,10 +205,8 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect count = drm_add_edid_modes(connector, edid); drm_edid_to_eld(connector, edid); } else { -#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE count = drm_load_edid_firmware(connector); if (count == 0) -#endif count = (*connector_funcs->get_modes)(connector); } diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index c0884e120041..4c390f91e137 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -347,7 +347,15 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb); int drm_av_sync_delay(struct drm_connector *connector, const struct drm_display_mode *mode); struct drm_connector *drm_select_eld(struct drm_encoder *encoder); + +#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE int drm_load_edid_firmware(struct drm_connector *connector); +#else +static inline int drm_load_edid_firmware(struct drm_connector *connector) +{ + return 0; +} +#endif int drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame, |