[src/trunk]: src/sys/external/bsd/drm2/i915drm Disable VGA plane after vga_cn...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d2feb0273c1b
branches:  trunk
changeset: 802439:d2feb0273c1b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Sep 14 16:02:15 2014 +0000

description:
Disable VGA plane after vga_cndetach.

Disabling the VGA plane requires access to the VGA registers, which
don't become available until vga_cndetach.  Oops!

diffstat:

 sys/external/bsd/drm2/i915drm/intelfb.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r de5afd9525c1 -r d2feb0273c1b sys/external/bsd/drm2/i915drm/intelfb.c
--- a/sys/external/bsd/drm2/i915drm/intelfb.c   Sun Sep 14 14:29:57 2014 +0000
+++ b/sys/external/bsd/drm2/i915drm/intelfb.c   Sun Sep 14 16:02:15 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intelfb.c,v 1.9 2014/08/09 12:46:07 jmcneill Exp $     */
+/*     $NetBSD: intelfb.c,v 1.10 2014/09/14 16:02:15 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.9 2014/08/09 12:46:07 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.10 2014/09/14 16:02:15 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -218,8 +218,8 @@
        if (vga_is_console(dev->pdev->pd_pa.pa_iot, -1)) {
                what_was_cons = CONS_VGA;
                prop_dictionary_set_bool(dict, "is_console", true);
+               vga_cndetach();
                i915_disable_vga(dev);
-               vga_cndetach();
        } else
 #endif
        if (genfb_is_console() && genfb_is_enabled()) {