[PATCH] drm/i915: Kick fbdev before vgacon

[PATCH] drm/i915: Kick fbdev before vgacon

[Daniel Vetter]

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>
---
 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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Kick fbdev before vgacon

[Chris Wilson]

On Fri, Nov 14, 2014 at 10:09:49AM +0100, Daniel Vetter 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>

Still smells like someone else's problem, a race in fbcon?

Anyway,
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH] drm/i915: Kick fbdev before vgacon

[Daniel Vetter]

On Fri, Nov 14, 2014 at 09:47:57AM +0000, Chris Wilson wrote:
> On Fri, Nov 14, 2014 at 10:09:49AM +0100, Daniel Vetter 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>
> 
> Still smells like someone else's problem, a race in fbcon?

My best theory is that vgacon tears down something that the vga16 fbdev
driver relies on. So by kicking that one before removing the vgacon driver
we somehow survive.

But tbh I don't really want to know.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Kick fbdev before vgacon

[Jani Nikula]

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

Re: [PATCH] drm/i915: Kick fbdev before vgacon

[shuang.he]

Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
-------------------------------------Summary-------------------------------------
Platform: baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=290/291->290/291
PNV: pass/total=351/356->356/356
ILK: pass/total=371/372->369/372
IVB: pass/total=545/546->544/546
SNB: pass/total=424/425->424/425
HSW: pass/total=579/579->579/579
BDW: pass/total=434/435->434/435
-------------------------------------Detailed-------------------------------------
test_platform: test_suite, test_case, result_with_drm_intel_nightly(count, machine_id...)...->result_with_patch_applied(count, machine_id)...
PNV: Intel_gpu_tools, igt_gen3_mixed_blits, CRASH(1, M23) -> PASS(4, M7)
PNV: Intel_gpu_tools, igt_gen3_render_linear_blits, CRASH(1, M23) -> PASS(1, M7)
PNV: Intel_gpu_tools, igt_gen3_render_mixed_blits, CRASH(1, M23) -> PASS(1, M7)
PNV: Intel_gpu_tools, igt_gen3_render_tiledx_blits, CRASH(2, M23)DMESG_WARN(1, M23)NRUN(1, M23) -> PASS(1, M7)
PNV: Intel_gpu_tools, igt_gen3_render_tiledy_blits, CRASH(1, M23) -> PASS(1, M7)
ILK: Intel_gpu_tools, igt_kms_flip_flip-vs-absolute-wf_vblank, PASS(1, M6) -> DMESG_WARN(1, M26)PASS(3, M26)
ILK: Intel_gpu_tools, igt_kms_flip_wf_vblank-vs-modeset-interruptible, PASS(1, M6) -> DMESG_WARN(1, M26)PASS(3, M26)
ILK: Intel_gpu_tools, igt_kms_setmode_invalid-clone-single-crtc, TIMEOUT(1, M6) -> FAIL(3, M26)TIMEOUT(1, M26)
IVB: Intel_gpu_tools, igt_kms_cursor_crc_cursor-64x64-offscreen, PASS(1, M4) -> DMESG_WARN(1, M21)PASS(3, M21)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx