diff options
| author | Ingo Molnar | 2019-06-17 12:12:27 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2019-06-17 12:12:27 +0200 |
| commit | 23da766ab1dc005860b675bf048226a11a748bf9 (patch) | |
| tree | 3f8dbfc2cf68f5da3faa3a377087b06dd8ad343d /include/drm/drm_edid.h | |
| parent | sched/fair: Remove sgs->sum_weighted_load (diff) | |
| parent | Linux 5.2-rc5 (diff) | |
| download | kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.tar.gz kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.tar.xz kernel-qcow2-linux-23da766ab1dc005860b675bf048226a11a748bf9.zip | |
Merge tag 'v5.2-rc5' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/drm/drm_edid.h')
| -rw-r--r-- | include/drm/drm_edid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 9d3b5b93102c..c9ca0be54d9a 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -471,6 +471,7 @@ struct edid *drm_get_edid_switcheroo(struct drm_connector *connector, struct i2c_adapter *adapter); struct edid *drm_edid_duplicate(const struct edid *edid); int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid); +int drm_add_override_edid_modes(struct drm_connector *connector); u8 drm_match_cea_mode(const struct drm_display_mode *to_match); enum hdmi_picture_aspect drm_get_cea_aspect_ratio(const u8 video_code); |