| Message ID | 20140707122654.GQ5821@phenom.ffwll.local (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Daniel, The patch below also works. You can use my Tested By for it. Thanks Ed Tomlinson <edtoml@gmail.com> PS. I _really_ need to get a serial console working on my i7 box. On Monday 07 July 2014 14:26:54 Daniel Vetter wrote: > On Mon, Jul 07, 2014 at 06:45:49AM -0400, Ed Tomlinson wrote: > > Daniel, > > > > I am not quite sure I understand what you want me to test? > > Do you want me to try it without: > > > > > > + if (ret == 0) { > > > > + ret = do_unregister_con_driver(&vga_con); > > Below the diff of what I mean. > -Daniel > > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 5e583a1838f8..bd8517151479 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -1466,12 +1466,13 @@ static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) > #else > static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) > { > - int ret; > + int ret = 0; > > DRM_INFO("Replacing VGA console driver\n"); > > console_lock(); > - ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); > + if (con_is_bound(&vga_con)) > + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); > if (ret == 0) { > ret = do_unregister_con_driver(&vga_con); > >
On Mon, Jul 07, 2014 at 10:53:16PM -0400, Ed Tomlinson wrote: > Hi Daniel, > > The patch below also works. You can use my Tested By for it. Thanks a lot for testing, patch submitted and should get forwarded asap. > > Thanks > Ed Tomlinson <edtoml@gmail.com> > > PS. I _really_ need to get a serial console working on my i7 box. Usually this doesn't help a lot with gfx initialization issues since we do an awful lot of setup while holding the console_lock. Which prevents any dmesg output on any console :( Cheers, Daniel > > On Monday 07 July 2014 14:26:54 Daniel Vetter wrote: > > On Mon, Jul 07, 2014 at 06:45:49AM -0400, Ed Tomlinson wrote: > > > Daniel, > > > > > > I am not quite sure I understand what you want me to test? > > > Do you want me to try it without: > > > > > > > > + if (ret == 0) { > > > > > + ret = do_unregister_con_driver(&vga_con); > > > > Below the diff of what I mean. > > -Daniel > > > > > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > > index 5e583a1838f8..bd8517151479 100644 > > --- a/drivers/gpu/drm/i915/i915_dma.c > > +++ b/drivers/gpu/drm/i915/i915_dma.c > > @@ -1466,12 +1466,13 @@ static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) > > #else > > static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) > > { > > - int ret; > > + int ret = 0; > > > > DRM_INFO("Replacing VGA console driver\n"); > > > > console_lock(); > > - ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); > > + if (con_is_bound(&vga_con)) > > + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); > > if (ret == 0) { > > ret = do_unregister_con_driver(&vga_con); > > > > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 5e583a1838f8..bd8517151479 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1466,12 +1466,13 @@ static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) #else static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv) { - int ret; + int ret = 0; DRM_INFO("Replacing VGA console driver\n"); console_lock(); - ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); + if (con_is_bound(&vga_con)) + ret = do_take_over_console(&dummy_con, 0, MAX_NR_CONSOLES - 1, 1); if (ret == 0) { ret = do_unregister_con_driver(&vga_con);