Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/fb-helper: Use drm_fb_helper_restore_fbdev_mode() in drm_fb_helper_set_par()

Use drm_fb_helper_restore_fbdev_mode() in drm_fb_helper_set_par() to
make sure extra planes get disabled whenever fbcon takes over.

Otherwise the code in drm_fb_helper_set_par() was already doing the
exact same thing as drm_fb_helper_restore_fbdev_mode(), so this doesn't
change the behaviour in any other way.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

authored by

Ville Syrjälä and committed by
Daniel Vetter
366d4807 24d01805

+1 -9
+1 -9
drivers/gpu/drm/drm_fb_helper.c
··· 809 809 struct drm_fb_helper *fb_helper = info->par; 810 810 struct drm_device *dev = fb_helper->dev; 811 811 struct fb_var_screeninfo *var = &info->var; 812 - int ret; 813 - int i; 814 812 815 813 if (var->pixclock != 0) { 816 814 DRM_ERROR("PIXEL CLOCK SET\n"); ··· 816 818 } 817 819 818 820 drm_modeset_lock_all(dev); 819 - for (i = 0; i < fb_helper->crtc_count; i++) { 820 - ret = drm_mode_set_config_internal(&fb_helper->crtc_info[i].mode_set); 821 - if (ret) { 822 - drm_modeset_unlock_all(dev); 823 - return ret; 824 - } 825 - } 821 + drm_fb_helper_restore_fbdev_mode(fb_helper); 826 822 drm_modeset_unlock_all(dev); 827 823 828 824 if (fb_helper->delayed_hotplug) {