diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-27 00:43:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-27 00:43:48 -0700 |
| commit | 32d3d6b1c6ea2d455cc6e345815be621cebe52f4 (patch) | |
| tree | 156939a160412a3474220ebb301286ea315fa09d /include | |
| parent | 653154b0997b67a55683277b6ab6a0c3c17210c9 (diff) | |
| parent | 6f5be8d26ce856ad9e38eabc21432ba89a8075c7 (diff) | |
Merge "drm: move edid property update and add modes out of edid firmware loader"
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_edid.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index ef8b6dcfb474..0f64739300ff 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -348,11 +348,12 @@ int drm_av_sync_delay(struct drm_connector *connector, 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); +struct edid *drm_load_edid_firmware(struct drm_connector *connector); #else -static inline int drm_load_edid_firmware(struct drm_connector *connector) +static inline struct edid * +drm_load_edid_firmware(struct drm_connector *connector) { - return 0; + return ERR_PTR(-ENOENT); } #endif |