Re: pkg/47828: sysutils/libpciaccess 0.13.1 incompatible with xorg-server 1.12.4?

[David Shao <davshao%gmail.com@localhost>]

The following reply was made to PR pkg/47828; it has been noted by GNATS.

From: David Shao <davshao%gmail.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/47828: sysutils/libpciaccess 0.13.1 incompatible with
 xorg-server 1.12.4?
Date: Fri, 17 May 2013 16:10:44 -0700

 The following patch to sysutils/libpciaccess from
 https://bugs.freedesktop.org/attachment.cgi?id=78130
 has been verified to at least get a DragonFly 3.5-DEVELOPMENT x86_64
 machine, with an msi Radeon R4350 graphics card, to use the
 xf86-video-vesa driver with KDE 4.10.2.  In addition I switched to
 using moused instead of usbd to get the mouse working.
 
 It appears that someone will either have to develop a similar patch
 for NetBSD for vesa or implement KMS kernel modesetting to use the
 hardware accelerated ati driver for similar graphics cards.
 
 diff --git a/sysutils/libpciaccess/distinfo b/sysutils/libpciaccess/distinfo
 index 2bb05aa..ca38e5d 100644
 --- a/sysutils/libpciaccess/distinfo
 +++ b/sysutils/libpciaccess/distinfo
 @@ -9,6 +9,7 @@ SHA1 (patch-scanpci_Makefile.am) =
 086fead04b4a2e506a35aca5d5fe82395708e90c
  SHA1 (patch-scanpci_scanpci.c) = 795d0572af9afb13af60f878f9f44d40edb33463
  SHA1 (patch-src_common__bridge.c) = 658815c38b4f2e318bf083bc81b9042f88d04b2f
  SHA1 (patch-src_common__init.c) = 2e866fbb6278e84dfa295f55a9f30563489ae12d
 +SHA1 (patch-src_freebsd__pci.c) = 477fb98f33f93b79f54d085a21d45f50a0f14eca
  SHA1 (patch-src_pciaccess__private.h) =
 56853598f50e5656ff7ba190b31f2940d66ec468
  SHA1 (patch-src_solx__devfs.c) = 924649d561bc9922b6ee8335ffe5e997b1cb8c3c
  SHA1 (patch-src_x86__pci.c) = b9820f8ff9306c18d040444e57270f520f95a58f
 diff --git a/sysutils/libpciaccess/patches/patch-src_freebsd__pci.c
 b/sysutils/libpciaccess/patches/patch-src_freebsd__pci.c
 new file mode 100644
 index 0000000..06c9cfb
 --- /dev/null
 +++ b/sysutils/libpciaccess/patches/patch-src_freebsd__pci.c
 @@ -0,0 +1,172 @@
 +$NetBSD$
 +
 +--- src/freebsd_pci.c.orig     2013-05-17 21:55:52.935930000 +0000
 ++++ src/freebsd_pci.c
 +@@ -1,6 +1,8 @@
 + /*
 +  * (C) Copyright Eric Anholt 2006
 +  * (C) Copyright IBM Corporation 2006
 ++ * (C) Copyright Mark Kettenis 2011
 ++ * (C) Copyright Robert Millan 2012
 +  * All Rights Reserved.
 +  *
 +  * Permission is hereby granted, free of charge, to any person obtaining a
 +@@ -561,6 +563,139 @@ pci_system_freebsd_destroy(void)
 +     freebsd_pci_sys = NULL;
 + }
 +
 ++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
 ++#include <machine/cpufunc.h>
 ++#endif
 ++
 ++static struct pci_io_handle *
 ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret,
 ++    struct pci_device *dev, pciaddr_t base, pciaddr_t size)
 ++{
 ++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
 ++      ret->fd = open("/dev/io", O_RDWR | O_CLOEXEC);
 ++
 ++      if (ret->fd < 0)
 ++              return NULL;
 ++
 ++      ret->base = base;
 ++      ret->size = size;
 ++      return ret;
 ++#elif defined(PCI_MAGIC_IO_RANGE)
 ++      ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
 ++    aperturefd, PCI_MAGIC_IO_RANGE + base);
 ++      if (ret->memory == MAP_FAILED)
 ++              return NULL;
 ++
 ++      ret->base = base;
 ++      ret->size = size;
 ++      return ret;
 ++#else
 ++      return NULL;
 ++#endif
 ++}
 ++
 ++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
 ++static void
 ++pci_device_freebsd_close_io(struct pci_device *dev, struct
 pci_io_handle *handle)
 ++{
 ++      if (handle->fd > -1)
 ++              close(handle->fd);
 ++}
 ++#endif
 ++
 ++static uint32_t
 ++pci_device_freebsd_read32(struct pci_io_handle *handle, uint32_t reg)
 ++{
 ++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
 ++      return inl(handle->base + reg);
 ++#else
 ++      return *(uint32_t *)((uintptr_t)handle->memory + reg);
 ++#endif
 ++}
 ++
 ++static uint16_t
 ++pci_device_freebsd_read16(struct pci_io_handle *handle, uint32_t reg)
 ++{
 ++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
 ++      return inw(handle->base + reg);
 ++#else
 ++      return *(uint16_t *)((uintptr_t)handle->memory + reg);
 ++#endif
 ++}
 ++
 ++static uint8_t
 ++pci_device_freebsd_read8(struct pci_io_handle *handle, uint32_t reg)
 ++{
 ++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
 ++      return inb(handle->base + reg);
 ++#else
 ++      return *(uint8_t *)((uintptr_t)handle->memory + reg);
 ++#endif
 ++}
 ++
 ++static void
 ++pci_device_freebsd_write32(struct pci_io_handle *handle, uint32_t reg,
 ++    uint32_t data)
 ++{
 ++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
 ++      outl(handle->base + reg, data);
 ++#else
 ++      *(uint16_t *)((uintptr_t)handle->memory + reg) = data;
 ++#endif
 ++}
 ++
 ++static void
 ++pci_device_freebsd_write16(struct pci_io_handle *handle, uint32_t reg,
 ++    uint16_t data)
 ++{
 ++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
 ++      outw(handle->base + reg, data);
 ++#else
 ++      *(uint8_t *)((uintptr_t)handle->memory + reg) = data;
 ++#endif
 ++}
 ++
 ++static void
 ++pci_device_freebsd_write8(struct pci_io_handle *handle, uint32_t reg,
 ++    uint8_t data)
 ++{
 ++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
 ++      outb(handle->base + reg, data);
 ++#else
 ++      *(uint32_t *)((uintptr_t)handle->memory + reg) = data;
 ++#endif
 ++}
 ++
 ++static int
 ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base,
 ++    pciaddr_t size, unsigned map_flags, void **addr)
 ++{
 ++      struct pci_device_mapping map;
 ++      int err;
 ++
 ++      map.base = base;
 ++      map.size = size;
 ++      map.flags = map_flags;
 ++      map.memory = NULL;
 ++      err = pci_device_freebsd_map_range(dev, &map);
 
 ++      *addr = map.memory;
 ++
 ++      return err;
 ++}
 ++
 ++static int
 ++pci_device_freebsd_unmap_legacy(struct pci_device *dev, void *addr,
 ++    pciaddr_t size)
 ++{
 ++      struct pci_device_mapping map;
 ++
 ++      map.memory = addr;
 ++      map.size = size;
 ++      map.flags = 0;
 ++      return pci_device_freebsd_unmap_range(dev, &map);
 ++}
 ++
 ++
 + static const struct pci_system_methods freebsd_pci_methods = {
 +     .destroy = pci_system_freebsd_destroy,
 +     .destroy_device = NULL, /* nothing to do for this */
 +@@ -571,6 +706,18 @@ static const struct pci_system_methods f
 +     .read = pci_device_freebsd_read,
 +     .write = pci_device_freebsd_write,
 +     .fill_capabilities = pci_fill_capabilities_generic,
 ++    .open_legacy_io = pci_device_freebsd_open_legacy_io,
 ++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
 ++    .close_io = pci_device_freebsd_close_io,
 ++#endif
 ++    .read32 = pci_device_freebsd_read32,
 ++    .read16 = pci_device_freebsd_read16,
 ++    .read8 = pci_device_freebsd_read8,
 ++    .write32 = pci_device_freebsd_write32,
 ++    .write16 = pci_device_freebsd_write16,
 ++    .write8 = pci_device_freebsd_write8,
 ++    .map_legacy = pci_device_freebsd_map_legacy,
 ++    .unmap_legacy = pci_device_freebsd_unmap_legacy,
 + };
 +
 + /**