Module Name: src
Committed By: riastradh
Date: Sun Sep 14 16:02:15 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm: intelfb.c
Log Message:
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!
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/i915drm/intelfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.9 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.10
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.9 Sat Aug 9 12:46:07 2014
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c Sun Sep 14 16:02:15 2014
@@ -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 @@ intelfb_setconfig_task(struct i915drmkms
if (vga_is_console(dev->pdev->pd_pa.pa_iot, -1)) {
what_was_cons = CONS_VGA;
prop_dictionary_set_bool(dict, "is_console", true);
- i915_disable_vga(dev);
vga_cndetach();
+ i915_disable_vga(dev);
} else
#endif
if (genfb_is_console() && genfb_is_enabled()) {
