On Fri, 14 Nov 2014, Daniel Vetter <[email protected]> wrote:
> It's magic, but it seems to work.
>
> This fixes a regression introduced in
>
> commit 1bb9e632a0aeee1121e652ee4dc80e5e6f14bcd2
> Author: Daniel Vetter <[email protected]>
> 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: [email protected]
> Reported-and-Tested-by: Lv Zheng <[email protected]>
> Signed-off-by: Daniel Vetter <[email protected]>
Pushed to drm-intel-fixes. Thanks for the patch.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/i915_dma.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 5dc37f0233b2..56f62112411a 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1666,15 +1666,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;
> }
> }
> --
> 2.1.1
>
--
Jani Nikula, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
