Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge xf86-video-ati 19.1.0, xf86-video-amdgp...
details: https://anonhg.NetBSD.org/xsrc/rev/65c294cde22c
branches: trunk
changeset: 10430:65c294cde22c
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Feb 23 06:33:19 2020 +0000
description:
merge xf86-video-ati 19.1.0, xf86-video-amdgpu 19.1.0,
xf86-video-geode 2.11.20, and xf86-video-s3 0.7.0.
diffstat:
external/mit/xf86-video-amdgpu/include/config.h | 10 +-
external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c | 47 +++++---
external/mit/xf86-video-ati-kms/include/config.h | 10 +-
external/mit/xf86-video-geode/dist/src/gx_driver.c | 2 +-
external/mit/xf86-video-s3/dist/README | 20 ---
external/mit/xf86-video-s3/dist/compile | 101 ++++++++++++-----
external/mit/xf86-video-s3/dist/src/s3.h | 22 +++-
external/mit/xf86-video-s3/dist/src/s3_bios.c | 68 +-----------
external/mit/xf86-video-s3/dist/src/s3_driver.c | 5 +-
9 files changed, 129 insertions(+), 156 deletions(-)
diffs (truncated from 516 to 300 lines):
diff -r 5b1663394087 -r 65c294cde22c external/mit/xf86-video-amdgpu/include/config.h
--- a/external/mit/xf86-video-amdgpu/include/config.h Sun Feb 23 06:17:15 2020 +0000
+++ b/external/mit/xf86-video-amdgpu/include/config.h Sun Feb 23 06:33:19 2020 +0000
@@ -88,7 +88,7 @@
#define PACKAGE_NAME "xf86-video-amdgpu"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-amdgpu 19.0.1"
+#define PACKAGE_STRING "xf86-video-amdgpu 19.1.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xf86-video-amdgpu"
@@ -97,16 +97,16 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "19.0.1"
+#define PACKAGE_VERSION "19.1.0"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 19
/* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 0
+#define PACKAGE_VERSION_MINOR 1
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 1
+#define PACKAGE_VERSION_PATCHLEVEL 0
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -118,7 +118,7 @@
#define USE_SYS_ENDIAN_H 1
/* Version number of package */
-#define VERSION "19.0.1"
+#define VERSION "19.1.0"
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
diff -r 5b1663394087 -r 65c294cde22c external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c
--- a/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c Sun Feb 23 06:17:15 2020 +0000
+++ b/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c Sun Feb 23 06:33:19 2020 +0000
@@ -1917,19 +1917,15 @@
if (!pScrn->is_gpu) {
if (info->dri2.pKernelDRMVersion->version_minor >= 8) {
- Bool sw_cursor = xf86ReturnOptValBool(info->Options,
- OPTION_SW_CURSOR, FALSE);
-
info->allowPageFlip = xf86ReturnOptValBool(info->Options,
OPTION_PAGE_FLIP, TRUE);
- if (sw_cursor || info->shadow_primary) {
+ if (info->shadow_primary) {
xf86DrvMsg(pScrn->scrnIndex,
info->allowPageFlip ? X_WARNING : X_DEFAULT,
"KMS Pageflipping: disabled%s\n",
info->allowPageFlip ?
- (sw_cursor ? " because of SWcursor" :
- " because of ShadowPrimary") : "");
+ " because of ShadowPrimary" : "");
info->allowPageFlip = FALSE;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -2606,16 +2602,25 @@
}
static void
-pixmap_unref_fb(void *value, XID id, void *cdata)
+pixmap_unref_fb(PixmapPtr pixmap)
{
- PixmapPtr pixmap = value;
- RADEONEntPtr pRADEONEnt = cdata;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen);
struct drmmode_fb **fb_ptr = radeon_pixmap_get_fb_ptr(pixmap);
+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
if (fb_ptr)
drmmode_fb_reference(pRADEONEnt->fd, fb_ptr, NULL);
}
+static void
+client_pixmap_unref_fb(void *value, XID id, void *pScreen)
+{
+ PixmapPtr pixmap = value;
+
+ if (pixmap->drawable.pScreen == pScreen)
+ pixmap_unref_fb(pixmap);
+}
+
void RADEONLeaveVT_KMS(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
@@ -2633,6 +2638,12 @@
unsigned w = 0, h = 0;
int i;
+ /* If we're called from CloseScreen, trying to clear the black
+ * scanout BO will likely crash and burn
+ */
+ if (!pScreen->GCperDepth[0])
+ goto hide_cursors;
+
/* Compute maximum scanout dimensions of active CRTCs */
for (i = 0; i < xf86_config->num_crtc; i++) {
crtc = xf86_config->crtc[i];
@@ -2671,11 +2682,9 @@
if (pScrn->is_gpu) {
if (drmmode_crtc->scanout[0].pixmap)
- pixmap_unref_fb(drmmode_crtc->scanout[0].pixmap,
- None, pRADEONEnt);
+ pixmap_unref_fb(drmmode_crtc->scanout[0].pixmap);
if (drmmode_crtc->scanout[1].pixmap)
- pixmap_unref_fb(drmmode_crtc->scanout[1].pixmap,
- None, pRADEONEnt);
+ pixmap_unref_fb(drmmode_crtc->scanout[1].pixmap);
} else {
drmmode_crtc_scanout_free(crtc);
}
@@ -2695,18 +2704,20 @@
(!clients[i] || clients[i]->clientState != ClientStateRunning))
continue;
- FindClientResourcesByType(clients[i], RT_PIXMAP, pixmap_unref_fb,
- pRADEONEnt);
+ FindClientResourcesByType(clients[i], RT_PIXMAP,
+ client_pixmap_unref_fb, pScreen);
}
- pixmap_unref_fb(pScreen->GetScreenPixmap(pScreen), None, pRADEONEnt);
+ pixmap_unref_fb(pScreen->GetScreenPixmap(pScreen));
} else {
memset(info->front_buffer->bo.radeon->ptr, 0,
pScrn->displayWidth * info->pixel_bytes * pScrn->virtualY);
}
- TimerSet(NULL, 0, 1000, cleanup_black_fb, pScreen);
-
+ if (pScreen->GCperDepth[0])
+ TimerSet(NULL, 0, 1000, cleanup_black_fb, pScreen);
+
+ hide_cursors:
xf86_hide_cursors (pScrn);
radeon_drop_drm_master(pScrn);
diff -r 5b1663394087 -r 65c294cde22c external/mit/xf86-video-ati-kms/include/config.h
--- a/external/mit/xf86-video-ati-kms/include/config.h Sun Feb 23 06:17:15 2020 +0000
+++ b/external/mit/xf86-video-ati-kms/include/config.h Sun Feb 23 06:33:19 2020 +0000
@@ -85,7 +85,7 @@
#define PACKAGE_NAME "xf86-video-ati"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-ati 19.0.1"
+#define PACKAGE_STRING "xf86-video-ati 19.1.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xf86-video-ati"
@@ -94,16 +94,16 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "19.0.1"
+#define PACKAGE_VERSION "19.1.0"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 19
/* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 0
+#define PACKAGE_VERSION_MINOR 1
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 1
+#define PACKAGE_VERSION_PATCHLEVEL 0
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -115,7 +115,7 @@
#define USE_SYS_ENDIAN_H 1
/* Version number of package */
-#define VERSION "19.0.1"
+#define VERSION "19.1.0"
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
diff -r 5b1663394087 -r 65c294cde22c external/mit/xf86-video-geode/dist/src/gx_driver.c
--- a/external/mit/xf86-video-geode/dist/src/gx_driver.c Sun Feb 23 06:17:15 2020 +0000
+++ b/external/mit/xf86-video-geode/dist/src/gx_driver.c Sun Feb 23 06:33:19 2020 +0000
@@ -1428,7 +1428,7 @@
/* Set up RandR */
-#if 0
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24
xf86DisableRandR(); /* We provide our own RandR goodness */
#endif
diff -r 5b1663394087 -r 65c294cde22c external/mit/xf86-video-s3/dist/README
--- a/external/mit/xf86-video-s3/dist/README Sun Feb 23 06:17:15 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-xf86-video-s3 - Xorg driver for S3 chipsets other than ViRGE or Savage
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-s3
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-s3
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -r 5b1663394087 -r 65c294cde22c external/mit/xf86-video-s3/dist/compile
--- a/external/mit/xf86-video-s3/dist/compile Sun Feb 23 06:17:15 2020 +0000
+++ b/external/mit/xf86-video-s3/dist/compile Sun Feb 23 06:33:19 2020 +0000
@@ -1,10 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey%cygnus.com@localhost>.
#
# This program is free software; you can redistribute it and/or modify
@@ -79,6 +78,53 @@
esac
}
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
@@ -109,43 +155,34 @@
;;
esac
;;
+ -I)
Home |
Main Index |
Thread Index |
Old Index