diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-02-17 16:20:51 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-02-21 14:41:24 +0100 |
| commit | 07c2b84b9956dd5d0871d47f5f0bbf9388d2d83f (patch) | |
| tree | a17daf31459a45c03965b507ed7668556d3f5acc /include/drm/drm_edid.h | |
| parent | drm/virtio: call drm_plane_cleanup() at destroy phase (diff) | |
| download | linux-07c2b84b9956dd5d0871d47f5f0bbf9388d2d83f.tar.xz linux-07c2b84b9956dd5d0871d47f5f0bbf9388d2d83f.zip | |
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
Diffstat (limited to 'include/drm/drm_edid.h')
| -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 43fb0ac5eb9c..a55eea4afb61 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -331,11 +331,12 @@ int drm_av_sync_delay(struct drm_connector *connector, const struct drm_display_mode *mode); #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 |