Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 366d4807 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 24d01805

drivers/gpu/drm/drm_fb_helper.c

+1 −9
Original line number Diff line number Diff line
@@ -809,8 +809,6 @@ int drm_fb_helper_set_par(struct fb_info *info) 
	struct drm_fb_helper *fb_helper = info->par;

	struct drm_device *dev = fb_helper->dev;

	struct fb_var_screeninfo *var = &info->var;

	int ret;

	int i;



	if (var->pixclock != 0) {

		DRM_ERROR("PIXEL CLOCK SET\n");
@@ -818,13 +816,7 @@ int drm_fb_helper_set_par(struct fb_info *info) 
	}



	drm_modeset_lock_all(dev);

	for (i = 0; i < fb_helper->crtc_count; i++) {

		ret = drm_mode_set_config_internal(&fb_helper->crtc_info[i].mode_set);

		if (ret) {

			drm_modeset_unlock_all(dev);

			return ret;

		}

	}

	drm_fb_helper_restore_fbdev_mode(fb_helper);

	drm_modeset_unlock_all(dev);



	if (fb_helper->delayed_hotplug) {