xf86-video-ati-dfbsd: Update wip/xf86-video-ati-dfbsd to git 2019-02-11
Switch from release to using latest git master.
This commit is contained in:
David Shao
parent
0e3aa62763
commit
596f71ed46
|
|
@ -1,9 +1,24 @@
|
|||
# $NetBSD: Makefile,v 1.47 2018/09/16 20:28:51 triaxx Exp $
|
||||
|
||||
DISTNAME= xf86-video-ati-18.1.0
|
||||
# 2019-02-11 Keep waiting for a pending flip if drm_handle_event returns 0
|
||||
COMMIT_ID= 15697ee242c30b9ea6775624e8282e0171a113a7
|
||||
|
||||
# 2018-07-12 Add RandR leases support
|
||||
# COMMIT_ID= f533b1f654952cee794de49d28d01947a6571daf
|
||||
|
||||
PORTNAME= xf86-video-ati
|
||||
|
||||
DISTNAME= ${PORTNAME}-${COMMIT_ID}
|
||||
PKGNAME= ${PORTNAME}-18.1.0
|
||||
# PKGREVISION= 1
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
MASTER_SITES= http://cgit.freedesktop.org/xorg/driver/${PORTNAME}/snapshot/
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
# DISTNAME= xf86-video-ati-18.1.0
|
||||
# CATEGORIES= x11
|
||||
# MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
|
||||
# EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= joerg@NetBSD.org
|
||||
HOMEPAGE= http://xorg.freedesktop.org/
|
||||
|
|
@ -16,7 +31,8 @@ CONFLICTS+= xf86-video-ati6-[0-9]*
|
|||
|
||||
USE_LIBTOOL= YES
|
||||
GNU_CONFIGURE= YES
|
||||
USE_TOOLS+= gmake pkg-config
|
||||
# USE_TOOLS+= gmake pkg-config
|
||||
USE_TOOLS+= gmake pkg-config autoconf automake autoreconf
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
|
|
@ -38,6 +54,8 @@ CONFIGURE_ARGS+= --enable-glamor
|
|||
CFLAGS+= -O0 -g3
|
||||
.endif
|
||||
|
||||
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
|
||||
|
||||
# Revert: Use gbm as much as possible for bo allocation
|
||||
# 2018-07-09 18:28:21 +0200
|
||||
# https://cgit.freedesktop.org/xorg/driver/xf86-video-ati
|
||||
|
|
@ -46,7 +64,8 @@ CFLAGS+= -O0 -g3
|
|||
CPPFLAGS+= -DREVERT_GBM_BO
|
||||
.endif
|
||||
|
||||
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
|
||||
pre-configure:
|
||||
cd ${WRKSRC} && autoreconf -vif
|
||||
|
||||
BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.18.1
|
||||
.include "../../x11/modular-xorg-server/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
$NetBSD: distinfo,v 1.35 2018/09/16 20:28:51 triaxx Exp $
|
||||
|
||||
SHA1 (xf86-video-ati-18.1.0.tar.bz2) = 87beb7d09f5b722570adda9a5a1822cbd19e7059
|
||||
RMD160 (xf86-video-ati-18.1.0.tar.bz2) = c9ab92004212306fd2347d9683d7c16ce9dc7085
|
||||
SHA512 (xf86-video-ati-18.1.0.tar.bz2) = 7a58c9a6cb4876bd2ff37d837372b4e360e81fec7de6a6c7a48d70a5338d62745f734f5d4207f30aa368ff2d9ef44f5f1ef36afd73802a618998c16fe395ed53
|
||||
Size (xf86-video-ati-18.1.0.tar.bz2) = 891953 bytes
|
||||
SHA1 (patch-configure) = bdd1014b215af69c2bb837d36829e12e86eb5764
|
||||
SHA1 (xf86-video-ati-15697ee242c30b9ea6775624e8282e0171a113a7.tar.xz) = 29df80406db765ff7dc13bee84258ac51477a76a
|
||||
RMD160 (xf86-video-ati-15697ee242c30b9ea6775624e8282e0171a113a7.tar.xz) = 0f9bbd4736a6d82f53cf6b8587b0483a207c8c85
|
||||
SHA512 (xf86-video-ati-15697ee242c30b9ea6775624e8282e0171a113a7.tar.xz) = 68483483395c3299e1deef65d0d0cffbe167209246a3501c94768dda3f9e2e71090dea13d4bdc2074ef31a35c174ebd51b86e218d66df2c4eb0bec79ce4bbca4
|
||||
Size (xf86-video-ati-15697ee242c30b9ea6775624e8282e0171a113a7.tar.xz) = 235796 bytes
|
||||
SHA1 (patch-configure.ac) = 5eaf572e1beff0f392f71141ab3c811427a76af4
|
||||
SHA1 (patch-src_drmmode__display.c) = e243e856507b4b3f1037838ee21c7258a5e83c07
|
||||
SHA1 (patch-src_radeon.h) = 938492aede478f071bdc22d907235c1fd9b27cbb
|
||||
SHA1 (patch-src_radeon__bo__helper.c) = e8d7e122b84ded2d7dec50262f48568cf59f27a2
|
||||
SHA1 (patch-src_radeon__bo__helper.h) = bf01afbec90e6a6a8eed0f2f604d4ac0dd616a65
|
||||
SHA1 (patch-src_radeon__dri2.c) = 0124a167886cca1f8c2734b9bc1acf77ec3ff112
|
||||
SHA1 (patch-src_radeon__dri3.c) = d47e68602b814d5ea469346451c5c91c46c66b21
|
||||
SHA1 (patch-src_radeon__dri3.c) = 0f1875927a31b498ee02ed957728c2a528738e0b
|
||||
SHA1 (patch-src_radeon__glamor.c) = 8821396b6c38497cd38b79ea09fb22161c56d6df
|
||||
SHA1 (patch-src_radeon__glamor.h) = 0a1d28fae719cf709545f6064cd2cc5114418c93
|
||||
SHA1 (patch-src_radeon__kms.c) = 9b435022971c4c1f92f8fb26e64c3e406cb98a06
|
||||
SHA1 (patch-src_radeon__kms.c) = cd32b351a70cbf64339f6cad5a37933a68fadf2d
|
||||
SHA1 (patch-src_radeon__probe.c) = a29be4b9295295668e0725083145ec67f01df2cb
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
$NetBSD: patch-configure,v 1.1 2018/05/20 07:11:10 wiz Exp $
|
||||
|
||||
Remove duplicate definitions - src/radeon.h defines these as well.
|
||||
|
||||
--- configure.ac.orig 2019-02-11 11:12:34.000000000 +0000
|
||||
+++ configure.ac
|
||||
@@ -254,12 +254,6 @@ b = bswap16(a);
|
||||
if test "$USE_SYS_ENDIAN_H" = "yes" ; then
|
||||
AC_DEFINE([USE_SYS_ENDIAN_H], 1,
|
||||
[Define to use byteswap macros from <sys/endian.h>])
|
||||
- AC_DEFINE_UNQUOTED([bswap_16], ${BSWAP}16,
|
||||
- [Define to 16-bit byteswap macro])
|
||||
- AC_DEFINE_UNQUOTED([bswap_32], ${BSWAP}32,
|
||||
- [Define to 32-bit byteswap macro])
|
||||
- AC_DEFINE_UNQUOTED([bswap_64], ${BSWAP}64,
|
||||
- [Define to 64-bit byteswap macro])
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -6,14 +6,16 @@ commit 3c4c0213c11d623cba7adbc28dde652694f2f758
|
|||
|
||||
https://cgit.freedesktop.org/xorg/driver/xf86-video-ati
|
||||
|
||||
--- src/radeon_dri3.c.orig 2018-09-14 15:56:09.000000000 +0000
|
||||
--- src/radeon_dri3.c.orig 2019-02-11 11:12:34.000000000 +0000
|
||||
+++ src/radeon_dri3.c
|
||||
@@ -214,6 +214,22 @@ static int radeon_dri3_fd_from_pixmap(Sc
|
||||
@@ -213,6 +213,24 @@ static int radeon_dri3_fd_from_pixmap(Sc
|
||||
CARD16 *stride,
|
||||
CARD32 *size)
|
||||
{
|
||||
struct radeon_bo *bo;
|
||||
int fd;
|
||||
+
|
||||
+#if defined(REVERT_GBM_BO)
|
||||
+ struct radeon_bo *bo;
|
||||
+ int fd;
|
||||
+
|
||||
+ bo = radeon_get_pixmap_bo(pixmap)->bo.radeon;
|
||||
+ if (!bo) {
|
||||
+#ifdef USE_GLAMOR
|
||||
|
|
@ -28,10 +30,10 @@ https://cgit.freedesktop.org/xorg/driver/xf86-video-ati
|
|||
+ return -1;
|
||||
+ }
|
||||
+#else /* !REVERT_GBM_BO */
|
||||
struct radeon_buffer *bo;
|
||||
int fd;
|
||||
#ifdef USE_GLAMOR
|
||||
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
|
||||
RADEONInfoPtr info = RADEONPTR(scrn);
|
||||
@@ -229,6 +245,7 @@ static int radeon_dri3_fd_from_pixmap(Sc
|
||||
@@ -256,15 +274,24 @@ static int radeon_dri3_fd_from_pixmap(Sc
|
||||
if (!bo)
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -39,3 +41,20 @@ https://cgit.freedesktop.org/xorg/driver/xf86-video-ati
|
|||
|
||||
if (pixmap->devKind > UINT16_MAX)
|
||||
return -1;
|
||||
|
||||
+#if defined(REVERT_GBM_BO)
|
||||
+ if (radeon_gem_prime_share_bo(bo, &fd) < 0)
|
||||
+#else /* !REVERT_GBM_BO */
|
||||
if (radeon_gem_prime_share_bo(bo->bo.radeon, &fd) < 0)
|
||||
+#endif /* REVERT_GBM_BO */
|
||||
return -1;
|
||||
|
||||
*stride = pixmap->devKind;
|
||||
+#if defined(REVERT_GBM_BO)
|
||||
+ *size = bo->size;
|
||||
+#else /* !REVERT_GBM_BO */
|
||||
*size = bo->bo.radeon->size;
|
||||
+#endif /* REVERT_GBM_BO */
|
||||
return fd;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ commit 3c4c0213c11d623cba7adbc28dde652694f2f758
|
|||
|
||||
https://cgit.freedesktop.org/xorg/driver/xf86-video-ati
|
||||
|
||||
--- src/radeon_kms.c.orig 2018-09-14 15:56:09.000000000 +0000
|
||||
--- src/radeon_kms.c.orig 2019-02-11 11:12:34.000000000 +0000
|
||||
+++ src/radeon_kms.c
|
||||
@@ -212,10 +212,12 @@ static void RADEONFreeRec(ScrnInfoPtr pS
|
||||
@@ -216,10 +216,12 @@ static void RADEONFreeRec(ScrnInfoPtr pS
|
||||
info->accel_state = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -19,9 +19,9 @@ https://cgit.freedesktop.org/xorg/driver/xf86-video-ati
|
|||
#endif
|
||||
+#endif /* !REVERT_GBM_BO */
|
||||
|
||||
pEnt = info->pEnt;
|
||||
free(pScrn->driverPrivate);
|
||||
@@ -2269,10 +2271,14 @@ Bool RADEONScreenInit_KMS(ScreenPtr pScr
|
||||
pRADEONEnt->scrn[info->instance_id] = NULL;
|
||||
pRADEONEnt->num_scrns--;
|
||||
@@ -2332,10 +2334,14 @@ Bool RADEONScreenInit_KMS(ScreenPtr pScr
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ https://cgit.freedesktop.org/xorg/driver/xf86-video-ati
|
|||
|
||||
if (info->r600_shadow_fb) {
|
||||
info->fb_shadow = calloc(1,
|
||||
@@ -2743,6 +2749,23 @@ static Bool radeon_setup_kernel_mem(Scre
|
||||
@@ -2807,6 +2813,23 @@ static Bool radeon_setup_kernel_mem(Scre
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ https://cgit.freedesktop.org/xorg/driver/xf86-video-ati
|
|||
if (!info->use_glamor) {
|
||||
#if X_BYTE_ORDER == X_BIG_ENDIAN
|
||||
switch (cpp) {
|
||||
@@ -2760,6 +2783,7 @@ static Bool radeon_setup_kernel_mem(Scre
|
||||
@@ -2824,6 +2847,7 @@ static Bool radeon_setup_kernel_mem(Scre
|
||||
if (tiling_flags)
|
||||
radeon_bo_set_tiling(info->front_buffer->bo.radeon, tiling_flags, pitch);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue