Index: head/x11-drivers/xf86-video-ati/Makefile =================================================================== --- head/x11-drivers/xf86-video-ati/Makefile (revision 431544) +++ head/x11-drivers/xf86-video-ati/Makefile (revision 431545) @@ -1,29 +1,25 @@ # $FreeBSD$ PORTNAME= xf86-video-ati -PORTVERSION= 7.8.0 +PORTVERSION= 7.5.0 +PORTEPOCH= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org ati display driver -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - -LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ - libdrm_radeon.so:graphics/libdrm - USE_GL= gl XORG_CAT= driver USE_XORG= xf86driproto \ xineramaproto \ xf86miscproto \ glproto \ presentproto INSTALL_TARGET= install-strip # No Radeon kernel driver on non-x86 and PC98. ONLY_FOR_ARCHS= i386 amd64 CONFIGURE_ARGS+=--disable-udev +CONFIGURE_ARGS+=--disable-glamor .include Index: head/x11-drivers/xf86-video-ati/distinfo =================================================================== --- head/x11-drivers/xf86-video-ati/distinfo (revision 431544) +++ head/x11-drivers/xf86-video-ati/distinfo (revision 431545) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479393377 -SHA256 (xorg/driver/xf86-video-ati-7.8.0.tar.bz2) = 401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa -SIZE (xorg/driver/xf86-video-ati-7.8.0.tar.bz2) = 845702 +TIMESTAMP = 1484479584 +SHA256 (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936 +SIZE (xorg/driver/xf86-video-ati-7.5.0.tar.bz2) = 809756 Index: head/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c =================================================================== --- head/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (nonexistent) +++ head/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (revision 431545) @@ -0,0 +1,11 @@ +--- src/radeon_dri2.c.orig 2013-02-22 19:31:34.000000000 +0000 ++++ src/radeon_dri2.c 2013-02-22 19:31:47.000000000 +0000 +@@ -578,7 +578,7 @@ + radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer data, pointer calldata) + { + DRI2ClientEventsPtr pClientEventsPriv; +- DRI2FrameEventPtr ref; ++ DRI2FrameEventPtr ref = NULL; + NewClientInfoRec *clientinfo = calldata; + ClientPtr pClient = clientinfo->client; + pClientEventsPriv = GetDRI2ClientEvents(pClient); Property changes on: head/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c =================================================================== --- head/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c (revision 431544) +++ head/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c (revision 431545) @@ -1,36 +1,45 @@ ---- src/radeon_kms.c.orig 2015-11-12 03:57:33.000000000 +0100 -+++ src/radeon_kms.c 2015-11-12 13:42:18.759377000 +0100 +--- src/radeon_kms.c.orig 2014-10-02 05:31:27.000000000 +0200 ++++ src/radeon_kms.c 2014-10-23 18:56:18.359108170 +0200 @@ -30,6 +30,8 @@ #include #include +#include +#include /* Driver data structures */ #include "radeon.h" - #include "radeon_drm_queue.h" -@@ -829,7 +831,7 @@ static int radeon_get_drm_master_fd(Scrn + #include "radeon_reg.h" +@@ -280,7 +282,7 @@ + radeon_dirty_update(ScreenPtr screen) + { + RegionPtr region; +- PixmapDirtyUpdatePtr ent; ++ PixmapDirtyUpdatePtr ent = NULL; + + if (xorg_list_is_empty(&screen->pixmap_dirty_list)) + return; +@@ -589,7 +591,7 @@ #endif struct pci_device *dev = info->PciInfo; char *busid; - int fd; + int fd, err; #ifdef XF86_PDEV_SERVER_FD if (pRADEONEnt->platform_dev) { -@@ -848,6 +850,15 @@ static int radeon_get_drm_master_fd(Scrn +@@ -608,6 +610,15 @@ dev->domain, dev->bus, dev->dev, dev->func); #endif + 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; + } + fd = drmOpen(NULL, busid); if (fd == -1) xf86DrvMsg(pScrn->scrnIndex, X_ERROR,