From: Jani Nikula <jani.nikula@linux.intel.com>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
stable@vger.kernel.org, Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH] drm/i915: Kick fbdev before vgacon
Date: Fri, 14 Nov 2014 13:22:14 +0200 [thread overview]
Message-ID: <87vbmiuivt.fsf@intel.com> (raw)
In-Reply-To: <1415956189-11347-1-git-send-email-daniel.vetter@ffwll.ch>
On Fri, 14 Nov 2014, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> It's magic, but it seems to work.
>
> This fixes a regression introduced in
>
> commit 1bb9e632a0aeee1121e652ee4dc80e5e6f14bcd2
> 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
> Reported-and-Tested-by: Lv Zheng <lv.zheng@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-11-14 11:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-14 9:09 [PATCH] drm/i915: Kick fbdev before vgacon Daniel Vetter
2014-11-14 9:47 ` [Intel-gfx] " Chris Wilson
2014-11-14 10:33 ` Daniel Vetter
2014-11-14 11:22 ` Jani Nikula [this message]
2014-11-14 15:23 ` shuang.he
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87vbmiuivt.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox