CVS commit: pkgsrc/x11/xf86-video-ati

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb  2 18:54:44 UTC 2017

Modified Files:
        pkgsrc/x11/xf86-video-ati: Makefile distinfo
Added Files:
        pkgsrc/x11/xf86-video-ati/patches: patch-src_radeon__kms.c

Log Message:
Updated xf86-video-ati to 7.8.0nb1:

Add patch from PR 50067 by David Shao, which comes from FreeBSD
ports/Dragonfly overlay, to improve the situation on FreeBSD and
Dragonfly.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/x11/xf86-video-ati/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/xf86-video-ati/distinfo
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__kms.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xf86-video-ati/Makefile
diff -u pkgsrc/x11/xf86-video-ati/Makefile:1.40 pkgsrc/x11/xf86-video-ati/Makefile:1.41
--- pkgsrc/x11/xf86-video-ati/Makefile:1.40     Thu Nov 17 20:57:54 2016
+++ pkgsrc/x11/xf86-video-ati/Makefile  Thu Feb  2 18:54:44 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2016/11/17 20:57:54 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2017/02/02 18:54:44 wiz Exp $
 
 DISTNAME=      xf86-video-ati-7.8.0
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/x11/xf86-video-ati/distinfo
diff -u pkgsrc/x11/xf86-video-ati/distinfo:1.28 pkgsrc/x11/xf86-video-ati/distinfo:1.29
--- pkgsrc/x11/xf86-video-ati/distinfo:1.28     Thu Nov 17 20:57:54 2016
+++ pkgsrc/x11/xf86-video-ati/distinfo  Thu Feb  2 18:54:44 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.28 2016/11/17 20:57:54 wiz Exp $
+$NetBSD: distinfo,v 1.29 2017/02/02 18:54:44 wiz Exp $
 
 SHA1 (xf86-video-ati-7.8.0.tar.bz2) = 30c4470d1252eade1d5c5998e42b66b0ac80a638
 RMD160 (xf86-video-ati-7.8.0.tar.bz2) = f5c6d63a33690fa7e035175a541cb33fef0c4fac
 SHA512 (xf86-video-ati-7.8.0.tar.bz2) = e09b7aca819656359d32b11f4314f2ad77b7a28d481b2cf17ea62f2e2385f9b40f568d5c76360c800c60c00671f0262277cdefde4c0744f2ed9b3b2fa90a37a9
 Size (xf86-video-ati-7.8.0.tar.bz2) = 845702 bytes
+SHA1 (patch-src_radeon__kms.c) = 61bbcb37bf986982cd27520eb48babac342e4fe0

Added files:

Index: pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__kms.c
diff -u /dev/null pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__kms.c:1.4
--- /dev/null   Thu Feb  2 18:54:44 2017
+++ pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__kms.c   Thu Feb  2 18:54:44 2017
@@ -0,0 +1,59 @@
+$NetBSD: patch-src_radeon__kms.c,v 1.4 2017/02/02 18:54:44 wiz Exp $
+
+From FreeBSD ports / DragonFly dports
+PR 50067
+
+--- src/radeon_kms.c.orig      2016-11-17 02:23:37.000000000 +0000
++++ src/radeon_kms.c
+@@ -30,6 +30,12 @@
+ 
+ #include <errno.h>
+ #include <sys/ioctl.h>
++
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
++#include <sys/param.h>
++#include <sys/linker.h>
++#endif
++
+ /* Driver data structures */
+ #include "radeon.h"
+ #include "radeon_drm_queue.h"
+@@ -811,7 +817,7 @@ radeon_dirty_update(ScrnInfoPtr scrn)
+ {
+       RADEONInfoPtr info = RADEONPTR(scrn);
+       ScreenPtr screen = scrn->pScreen;
+-      PixmapDirtyUpdatePtr ent;
++      PixmapDirtyUpdatePtr ent = NULL;
+       RegionPtr region;
+ 
+       xorg_list_for_each_entry(ent, &screen->pixmap_dirty_list, ent) {
+@@ -1391,7 +1397,11 @@ static int radeon_get_drm_master_fd(Scrn
+ #endif
+     struct pci_device *dev = info->PciInfo;
+     char *busid;
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
++    int fd, err;
++#else
+     int fd;
++#endif
+ 
+ #ifdef XF86_PDEV_SERVER_FD
+     if (pRADEONEnt->platform_dev) {
+@@ -1405,6 +1415,17 @@ static int radeon_get_drm_master_fd(Scrn
+     XNFasprintf(&busid, "pci:%04x:%02x:%02x.%d",
+                 dev->domain, dev->bus, dev->dev, dev->func);
+ 
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
++    err = kldload("radeonkms");
++    if (err == -1 && errno != EEXIST) {
++        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++               "[drm] Failed to load kernel module for %s: %s\n",
++               busid, strerror(errno));
++        free(busid);
++        return -1;
++    }
++#endif
++
+     fd = drmOpen(NULL, busid);
+     if (fd == -1)
+       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,