Module Name: src
Committed By: riastradh
Date: Wed Jul 23 18:05:44 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_pci.c
Log Message:
Omit redundant vga_is_console test.
This was a copypasta error -- before it tested iot then memt -- but I
see no evidence that passing memt to vga_is_console is ever sensible.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/i915drm/i915_pci.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/i915_pci.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.12 src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.13
--- src/sys/external/bsd/drm2/i915drm/i915_pci.c:1.12 Wed Jul 16 23:25:18 2014
+++ src/sys/external/bsd/drm2/i915drm/i915_pci.c Wed Jul 23 18:05:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci.c,v 1.12 2014/07/16 23:25:18 riastradh Exp $ */
+/* $NetBSD: i915_pci.c,v 1.13 2014/07/23 18:05:44 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.12 2014/07/16 23:25:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.13 2014/07/23 18:05:44 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -301,8 +301,7 @@ intel_genfb_attach(struct drm_device *de
int ret;
#if NVGA > 0
- if (vga_is_console(dev->pdev->pd_pa.pa_iot, -1) ||
- vga_is_console(dev->pdev->pd_pa.pa_iot, -1)) {
+ if (vga_is_console(dev->pdev->pd_pa.pa_iot, -1)) {
what_was_cons = CONS_VGA;
prop_dictionary_set_bool(dict, "is_console", true);
/*
