[Midnightbsd-cvs] mports [19228] trunk/x11-drivers/xf86-video-ati/files: patchset

[laffer1 at midnightbsd.org]

Revision: 19228
          http://svnweb.midnightbsd.org/mports/?rev=19228
Author:   laffer1
Date:     2015-05-29 18:23:53 -0400 (Fri, 29 May 2015)
Log Message:
-----------
patchset

Added Paths:
-----------
    trunk/x11-drivers/xf86-video-ati/files/patch-src__radeom_kms.c
    trunk/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c

Removed Paths:
-------------
    trunk/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
    trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c

Deleted: trunk/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
===================================================================
--- trunk/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c	2015-05-29 22:21:31 UTC (rev 19227)
+++ trunk/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c	2015-05-29 22:23:53 UTC (rev 19228)
@@ -1,37 +0,0 @@
---- 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) {
- 

Copied: trunk/x11-drivers/xf86-video-ati/files/patch-src__radeom_kms.c (from rev 19136, trunk/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c)
===================================================================
--- trunk/x11-drivers/xf86-video-ati/files/patch-src__radeom_kms.c	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-ati/files/patch-src__radeom_kms.c	2015-05-29 22:23:53 UTC (rev 19228)
@@ -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) {
+ 

Copied: trunk/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c (from rev 19136, trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c)
===================================================================
--- trunk/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c	2015-05-29 22:23:53 UTC (rev 19228)
@@ -0,0 +1,45 @@
+--- 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 <errno.h>
+ #include <sys/ioctl.h>
++#include <sys/param.h>
++#include <sys/linker.h>
+ /* Driver data structures */
+ #include "radeon.h"
+ #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) {
+@@ -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,

Deleted: trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
===================================================================
--- trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	2015-05-29 22:21:31 UTC (rev 19227)
+++ trunk/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c	2015-05-29 22:23:53 UTC (rev 19228)
@@ -1,15 +0,0 @@
---- 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__
--		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)
--			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
-+		*d = (*s >> 8) | (*s << 8);
- #endif
- 	    return;
-         }