[Midnightbsd-cvs] mports [17095] trunk/x11-drivers/xf86-video-ati: add patches
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 13 23:34:32 EDT 2014
Revision: 17095
http://svnweb.midnightbsd.org/mports/?rev=17095
Author: laffer1
Date: 2014-09-13 23:34:29 -0400 (Sat, 13 Sep 2014)
Log Message:
-----------
add patches
Modified Paths:
--------------
trunk/x11-drivers/xf86-video-ati/Makefile
trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
trunk/x11-drivers/xf86-video-ati/pkg-plist
Added Paths:
-----------
trunk/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
trunk/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c
Modified: trunk/x11-drivers/xf86-video-ati/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-ati/Makefile 2014-09-14 03:28:22 UTC (rev 17094)
+++ trunk/x11-drivers/xf86-video-ati/Makefile 2014-09-14 03:34:29 UTC (rev 17095)
@@ -7,6 +7,7 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org ati display driver
+
LICENSE= mit
USE_GL= gl
@@ -15,15 +16,30 @@
.include <bsd.mport.options.mk>
-.if !defined(WITH_NEW_XORG)
+.if (${OSVERSION} >= 6000)
+. if defined(WITH_NEW_XORG)
+NEW_ATI_DRIVER= yes
+. else
+NEW_ATI_DRIVER= no
+. endif
+.else
+. if defined(FORCE_KMS_ONLY_DDX)
+NEW_ATI_DRIVER= yes
+. else
+NEW_ATI_DRIVER= no
+. endif
+.endif
+
+.if ${NEW_ATI_DRIVER} == no
ATI_VERSION= 6.14.6
-ATI_REVISION= 1
+ATI_REVISION= 4
CONFIGURE_ARGS+=--disable-kms
PLIST_SUB+= OLD=""
.else
ATI_VERSION= 7.2.0
-ATI_REVISION= 1
+ATI_REVISION= 4
CONFIGURE_ARGS+=--disable-udev
+CONFIGURE_ARGS+=--disable-glamor
EXTRA_PATCHES+= ${FILESDIR}/extra-src__radeon_kms.c
PLIST_SUB+= OLD="@comment "
.endif
Added: trunk/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
===================================================================
--- trunk/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c (rev 0)
+++ trunk/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c 2014-09-14 03:34:29 UTC (rev 17095)
@@ -0,0 +1,37 @@
+--- src/radeon_kms.c.orig 2013-08-07 10:44:09.000000000 +0200
++++ src/radeon_kms.c 2013-08-31 19:29:11.369001510 +0200
+@@ -30,6 +30,8 @@
+
+ #include <errno.h>
+ #include <sys/ioctl.h>
++#include <sys/param.h>
++#include <sys/linker.h>
+ /* Driver data structures */
+ #include "radeon.h"
+ #include "radeon_reg.h"
+@@ -270,7 +272,7 @@
+ radeon_dirty_update(ScreenPtr screen)
+ {
+ RegionPtr region;
+- PixmapDirtyUpdatePtr ent;
++ PixmapDirtyUpdatePtr ent = NULL;
+
+ if (xorg_list_is_empty(&screen->pixmap_dirty_list))
+ return;
+@@ -606,6 +608,16 @@
+ 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 FALSE;
++ }
++
+ info->dri2.drm_fd = drmOpen("radeon", busid);
+ if (info->dri2.drm_fd == -1) {
+
Added: trunk/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c
===================================================================
--- trunk/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (rev 0)
+++ trunk/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c 2014-09-14 03:34:29 UTC (rev 17095)
@@ -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);
Modified: trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
===================================================================
--- trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c 2014-09-14 03:28:22 UTC (rev 17094)
+++ trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c 2014-09-14 03:34:29 UTC (rev 17095)
@@ -1,6 +1,6 @@
---- src/radeon_accel.c.orig 2012-04-15 19:36:08.000000000 +0200
-+++ src/radeon_accel.c 2012-04-15 19:36:15.000000000 +0200
-@@ -982,10 +982,9 @@
+--- src/radeon_accel.c.orig 2012-06-25 10:19:41.000000000 +0200
++++ src/radeon_accel.c 2012-07-30 02:11:51.000000000 +0200
+@@ -967,10 +967,9 @@
for (; nwords > 0; --nwords, ++d, ++s)
#ifdef __powerpc__
@@ -7,11 +7,9 @@
- asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
+ asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
#else
-- *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
+- *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
- | ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
+ *d = (*s >> 8) | (*s << 8);
#endif
return;
- }
-
-
+ }
Modified: trunk/x11-drivers/xf86-video-ati/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-video-ati/pkg-plist 2014-09-14 03:28:22 UTC (rev 17094)
+++ trunk/x11-drivers/xf86-video-ati/pkg-plist 2014-09-14 03:34:29 UTC (rev 17095)
@@ -1,12 +1,7 @@
-lib/xorg/modules/drivers/ati_drv.la
lib/xorg/modules/drivers/ati_drv.so
-lib/xorg/modules/drivers/radeon_drv.la
lib/xorg/modules/drivers/radeon_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.la
%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.la
%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la
%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so
man/man4/ati.4x.gz
man/man4/radeon.4x.gz
More information about the Midnightbsd-cvs
mailing list