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

Commit 0485c9dc authored by Daniel Vetter's avatar Daniel Vetter Committed by Jani Nikula
Browse files

drm/i915: Kick fbdev before vgacon 

It's magic, but it seems to work.

This fixes a regression introduced in

commit 1bb9e632
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Jul 8 10:02:43 2014 +0200

    drm/i915: Only unbind vgacon, not other console drivers

My best guess is that the vga fbdev driver falls over if we rip out
parts of vgacon. Hooray.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82439


Cc: stable@vger.kernel.org (v3.16+)
Reported-and-tested-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 2208d655

drivers/gpu/drm/i915/i915_dma.c

+6 −4
Original line number Diff line number Diff line
@@ -1670,15 +1670,17 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
		goto out_regs;



	if (drm_core_check_feature(dev, DRIVER_MODESET)) {

		ret = i915_kick_out_vgacon(dev_priv);

		/* WARNING: Apparently we must kick fbdev drivers before vgacon,

		 * otherwise the vga fbdev driver falls over. */

		ret = i915_kick_out_firmware_fb(dev_priv);

		if (ret) {

			DRM_ERROR("failed to remove conflicting VGA console\n");

			DRM_ERROR("failed to remove conflicting framebuffer drivers\n");

			goto out_gtt;

		}



		ret = i915_kick_out_firmware_fb(dev_priv);

		ret = i915_kick_out_vgacon(dev_priv);

		if (ret) {

			DRM_ERROR("failed to remove conflicting framebuffer drivers\n");

			DRM_ERROR("failed to remove conflicting VGA console\n");

			goto out_gtt;

		}

	}