FreeBSD Bugzilla – Attachment 179076 Details for
Bug 214587
x11-drivers/xf86-video-ati: Update to 7.8.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
update xf86-video-ati to 7.8.0
x11-drivers_xf86-video-ati.patch (text/plain), 7.81 KB, created by
Matthew Rezny
on 2017-01-19 18:14:20 UTC
(
hide
)
Description:
update xf86-video-ati to 7.8.0
Filename:
MIME Type:
Creator:
Matthew Rezny
Created:
2017-01-19 18:14:20 UTC
Size:
7.81 KB
patch
obsolete
>Index: x11-drivers/xf86-video-ati/Makefile >=================================================================== >--- x11-drivers/xf86-video-ati/Makefile (revision 431798) >+++ x11-drivers/xf86-video-ati/Makefile (working copy) >@@ -1,7 +1,7 @@ > # $FreeBSD$ > > PORTNAME= xf86-video-ati >-PORTVERSION= 7.5.0 >+PORTVERSION= 7.8.0 > PORTEPOCH= 1 > CATEGORIES= x11-drivers > >@@ -8,18 +8,20 @@ > 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 >+USE_XORG= dri3proto pciaccess >+ > # No Radeon kernel driver on non-x86 and PC98. > ONLY_FOR_ARCHS= i386 amd64 >+ONLY_FOR_ARCHS_REASON= KMS is required and currently only available on x86 > > CONFIGURE_ARGS+=--disable-udev >-CONFIGURE_ARGS+=--disable-glamor > > .include <bsd.port.mk> >Index: x11-drivers/xf86-video-ati/distinfo >=================================================================== >--- x11-drivers/xf86-video-ati/distinfo (revision 431798) >+++ x11-drivers/xf86-video-ati/distinfo (working copy) >@@ -1,3 +1,3 @@ >-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 >+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 >Index: x11-drivers/xf86-video-ati/files/patch-git_f11531c >=================================================================== >--- x11-drivers/xf86-video-ati/files/patch-git_f11531c (nonexistent) >+++ x11-drivers/xf86-video-ati/files/patch-git_f11531c (working copy) >@@ -0,0 +1,48 @@ >+From f11531c99fcd6473f58b4d10efaf3efd84304d8e Mon Sep 17 00:00:00 2001 >+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> >+Date: Mon, 21 Nov 2016 18:15:05 +0900 >+Subject: Enable glamor by default with >= R600 and Xorg >= 1.18.3 >+ >+glamor should now perform at least as well as EXA in general, and this >+allows DRI3 to be enabled by default for >= R600. >+ >+Reviewed-by: Alex Deucher <alexander.deucher@amd.com> >+ >+diff --git a/man/radeon.man b/man/radeon.man >+index 6af7a92..8990ae2 100644 >+--- man/radeon.man >++++ man/radeon.man >+@@ -293,7 +293,7 @@ Chooses between available acceleration architectures. Valid values are >+ .B glamor >+ (for R300 or higher). The default is >+ .B glamor >+-as of TAHITI, otherwise >++with R600 or newer (with Xorg >= 1.18.3, otherwise with TAHITI or newer), otherwise >+ .B EXA. >+ >+ .PP >+diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c >+index b66848f..590c9f0 100644 >+--- src/radeon_glamor.c >++++ src/radeon_glamor.c >+@@ -84,8 +84,15 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn) >+ return FALSE; >+ >+ s = xf86GetOptValString(info->Options, OPTION_ACCELMETHOD); >+- if (s == NULL && info->ChipFamily < CHIP_FAMILY_TAHITI) >+- return FALSE; >++ if (!s) { >++ if (xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0)) { >++ if (info->ChipFamily < CHIP_FAMILY_R600) >++ return FALSE; >++ } else { >++ if (info->ChipFamily < CHIP_FAMILY_TAHITI) >++ return FALSE; >++ } >++ } >+ >+ if (s && strcasecmp(s, "glamor") != 0) { >+ if (info->ChipFamily >= CHIP_FAMILY_TAHITI) >+-- >+cgit v0.10.2 >+ > >Property changes on: x11-drivers/xf86-video-ati/files/patch-git_f11531c >___________________________________________________________________ >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: x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c >=================================================================== >--- x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (revision 431798) >+++ x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c (nonexistent) >@@ -1,11 +0,0 @@ >---- 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: x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c >=================================================================== >--- x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c (revision 431798) >+++ x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c (working copy) >@@ -1,5 +1,5 @@ >---- 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 >+--- src/radeon_kms.c.orig 2016-11-17 02:23:37 UTC >++++ src/radeon_kms.c > @@ -30,6 +30,8 @@ > > #include <errno.h> >@@ -8,36 +8,18 @@ > +#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; >+ #include "radeon_drm_queue.h" >+@@ -1405,6 +1407,15 @@ static int radeon_get_drm_master_fd(Scrn >+ XNFasprintf(&busid, "pci:%04x:%02x:%02x.%d", >+ dev->domain, dev->bus, dev->dev, dev->func); > >- 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) { >++ fd = kldload("radeonkms"); >++ if (fd == -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; >++ return fd; > + } > + > fd = drmOpen(NULL, busid); >Index: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c >=================================================================== >--- x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c (revision 431798) >+++ x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c (nonexistent) >@@ -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; >- } > >Property changes on: x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 214587
:
177093
|
177241
| 179076