Update to 7.9.0

Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D10029
This commit is contained in:
Matthew Rezny 2017-03-16 16:29:07 +00:00
parent be86a74ca0
commit 6791f83e26
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=436284
4 changed files with 5 additions and 53 deletions

View file

@ -1,9 +1,8 @@
# $FreeBSD$
PORTNAME= xf86-video-ati
PORTVERSION= 7.8.0
PORTVERSION= 7.9.0
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

View file

@ -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 = 1489676661
SHA256 (xorg/driver/xf86-video-ati-7.9.0.tar.bz2) = 3cad872e6330afb1707da11e4e959e6887ebe5bcd81854b4d2e496c52c059875
SIZE (xorg/driver/xf86-video-ati-7.9.0.tar.bz2) = 848502

View file

@ -1,48 +0,0 @@
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

View file

@ -2,3 +2,4 @@ lib/xorg/modules/drivers/ati_drv.so
lib/xorg/modules/drivers/radeon_drv.so
man/man4/ati.4x.gz
man/man4/radeon.4x.gz
share/X11/xorg.conf.d/10-radeon.conf