Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/radeon fix some comments about the hal...
details: https://anonhg.NetBSD.org/src/rev/df272ed6091c
branches: trunk
changeset: 336436:df272ed6091c
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Mar 01 10:07:01 2015 +0000
description:
fix some comments about the half-working i386 hack.
diffstat:
sys/external/bsd/drm2/radeon/radeon_pci.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diffs (50 lines):
diff -r 024b37e94cc0 -r df272ed6091c sys/external/bsd/drm2/radeon/radeon_pci.c
--- a/sys/external/bsd/drm2/radeon/radeon_pci.c Sun Mar 01 09:56:54 2015 +0000
+++ b/sys/external/bsd/drm2/radeon/radeon_pci.c Sun Mar 01 10:07:01 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pci.c,v 1.6 2015/02/16 12:17:57 mrg Exp $ */
+/* $NetBSD: radeon_pci.c,v 1.7 2015/03/01 10:07:01 mrg Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.6 2015/02/16 12:17:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.7 2015/03/01 10:07:01 mrg Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -82,7 +82,7 @@
} sc_task_u;
struct drm_device *sc_drm_dev;
struct pci_dev sc_pci_dev;
-#ifdef __i386__
+#if defined(__i386__)
#define RADEON_PCI_UGLY_MAP_HACK
/* XXX Used to claim the VGA device before attach_real */
bus_space_handle_t sc_temp_memh;
@@ -174,9 +174,10 @@
#ifdef RADEON_PCI_UGLY_MAP_HACK
/*
* XXX
- * We map the VGA registers, so that other driver don't
- * think they can. This stops vga@isa or pcdisplay@isa
- * attaching, and stealing wsdisplay0. Yuck.
+ * We try to map the VGA registers, in case we can prevent vga@isa or
+ * pcdisplay@isa attaching, and stealing wsdisplay0. This only works
+ * with serial console, as actual VGA console has already mapped them.
+ * The only way to handle that is for vga@isa to not attach.
*/
int rv = bus_space_map(pa->pa_memt, 0xb0000, 0x10000, 0,
&sc->sc_temp_memh);
@@ -204,7 +205,7 @@
#ifdef RADEON_PCI_UGLY_MAP_HACK
/*
* XXX
- * Unmap the VGA registers so the DRM code can map them.
+ * Unmap the VGA registers.
*/
if (sc->sc_temp_set)
bus_space_unmap(pa->pa_memt, sc->sc_temp_memh, 0x10000);
Home |
Main Index |
Thread Index |
Old Index