 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #endif
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/workqueue.h>
 #include <dev/pci/pciio.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 @@ -72,27 +72,27 @@ SIMPLEQ_HEAD(radeon_task_head, radeon_ta
 struct radeon_softc {
 	device_t			sc_dev;
 	struct pci_attach_args		sc_pa;
 	enum {
 		RADEON_TASK_ATTACH,
 		RADEON_TASK_WORKQUEUE,
 	}				sc_task_state;
 	union {
 		struct workqueue		*workqueue;
 		struct radeon_task_head		attach;
 	}				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;
 	bool				sc_temp_set;
 #endif
 };
 struct radeon_device *
 radeon_device_private(device_t self)
+{
 	struct radeon_softc *const sc = device_private(self);
 	return sc->sc_drm_dev->dev_private;
 @@ -164,29 +164,30 @@ radeon_attach(device_t parent, device_t
 	pci_aprint_devinfo(pa, NULL);
 	/*
 	 * Trivial initialization first; the rest will come after we
 	 * have mounted the root file system and can load firmware
 	 * images.
 	 */
 	sc->sc_dev = NULL;
 	sc->sc_pa = *pa;
 #ifdef RADEON_PCI_UGLY_MAP_HACK
 	/*
 	 * XXX
-	 * We map the VGA registers, so that other driver don't
+	 * We try to map the VGA registers, in case we can prevent vga@isa or
-	 * think they can.  This stops vga@isa or pcdisplay@isa
+	 * pcdisplay@isa attaching, and stealing wsdisplay0.  This only works
-	 * attaching, and stealing wsdisplay0.  Yuck.
+	 * 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);
 	sc->sc_temp_set = rv == 0;
 	if (rv != 0)
 		aprint_error_dev(self, "unable to reserve VGA registers for "
 				       "i386 radeondrmkms hack\n");
 #endif
 	config_mountroot(self, &radeon_attach_real);
+}
 static void
 @@ -194,27 +195,27 @@ radeon_attach_real(device_t self)
+{
 	struct radeon_softc *const sc = device_private(self);
 	const struct pci_attach_args *const pa = &sc->sc_pa;
 	bool ok __diagused;
 	unsigned long flags;
 	int error;
 	ok = radeon_pci_lookup(pa, &flags);
 	KASSERT(ok);
 #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);
 #endif
 	sc->sc_task_state = RADEON_TASK_ATTACH;
 	SIMPLEQ_INIT(&sc->sc_task_u.attach);
 	/* XXX errno Linux->NetBSD */
 	error = -drm_pci_attach(self, pa, &sc->sc_pci_dev, radeon_drm_driver,
 	    flags, &sc->sc_drm_dev);
 	if (error) {
 		aprint_error_dev(self, "unable to attach drm: %d\n", error);