drm/fbdev: fix cloning on fbcon
Subsystems (2)
Dave Airlie
maintainerPATCH 1/1 drm/fbdev: fix cloning on fbcon
From: Dave Airlie <[email protected]>
Simple cloning rules compared to server:
(a) single crtc
(b) > 1 connector active
(c) check command line mode
(d) try and find 1024x768 DMT mode if no command line.
(e) fail to clone
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/drm_edid.c | 17 ++++--- drivers/gpu/drm/drm_fb_helper.c | 90 ++++++++++++++++++++++++++++++++++++-- include/drm/drm_crtc.h | 2 + 3 files changed, 96 insertions(+), 13 deletions(-)
drivers/gpu/drm/drm_edid.c +9 -8
@@ -658,8 +658,8 @@ static struct drm_display_mode drm_dmt_modes[] = {static const int drm_num_dmt_modes =sizeof (drm_dmt_modes) /sizeof (struct drm_display_mode ); -static struct drm_display_mode *drm_find_dmt (struct drm_device *dev, -int hsize,int vsize,int fresh) +struct drm_display_mode *drm_mode_find_dmt (struct drm_device *dev, +int hsize,int vsize,int fresh) {int i;struct drm_display_mode *ptr, *mode;
@@ -677,6 +677,7 @@ static struct drm_display_mode *drm_find_dmt(struct drm_device *dev, }return mode; } +EXPORT_SYMBOL (drm_mode_find_dmt);typedef void detailed_cb (struct detailed_timing *timing,void *closure);
@@ -866,7 +867,7 @@ drm_mode_std(struct drm_connector *connector, struct edid *edid, }/* check whether it can be found in default mode table */ - mode =drm_find_dmt (dev, hsize, vsize, vrefresh_rate); + mode =drm_mode_find_dmt (dev, hsize, vsize, vrefresh_rate);if (mode)return mode;
@@ -1386,11 +1387,11 @@ drm_est3_modes(struct drm_connector *connector, struct detailed_timing *timing)if (m > num_est3_modes)break ;if (est[i] & (1 << j)) { - mode =drm_find_dmt (connector->dev, - est3_modes[m].w, - est3_modes[m].h, - est3_modes[m].r -/*, est3_modes[m].rb */ ); + mode =drm_mode_find_dmt (connector->dev, + est3_modes[m].w, + est3_modes[m].h, + est3_modes[m].r +/*, est3_modes[m].rb */ );if (mode) {drm_mode_probed_add (connector, mode); modes++;
drivers/gpu/drm/drm_fb_helper.c +85 -5
108 lines not on this page · raw message
include/drm/drm_crtc.h +2 -0
@@ -804,4 +804,6 @@ extern int drm_add_modes_noedid(struct drm_connector *connector, int hdisplay, int vdisplay);extern bool drm_edid_is_valid (struct edid *edid); +struct drm_display_mode *drm_mode_find_dmt (struct drm_device *dev, +int hsize,int vsize,int fresh);#endif /* __DRM_CRTC_H__ */
Signature · 6 lines
1.7.0.1 ------------------------------------------------------------------------------ --