summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2017-02-17 17:20:51 +0200
committerGerrit - the friendly Code Review server <code-review@localhost>2019-07-26 17:26:40 -0700
commit6f5be8d26ce856ad9e38eabc21432ba89a8075c7 (patch)
tree73555dc0352335350fe315f950e631603f054c2b /include
parent5a248c6ff97b5f6d8b1b8e5ac1bede47d4e2d75e (diff)
drm: move edid property update and add modes out of edid firmware loader
Make the firmware loader more generic and generally useful. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1487344854-18777-2-git-send-email-jani.nikula@intel.com Git-commit: 07c2b84b9956dd5d0871d47f5f0bbf9388d2d83f Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Change-Id: I918426a1ef7b11cfea95827b89eec821d1f4a95a Signed-off-by: Tanmay Shah <tanmay@codeaurora.org>
Diffstat (limited to 'include')
-rw-r--r--include/drm/drm_edid.h7
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