xserver-xorg-video-ati: Changes to 'ubuntu'
.dir-locals.el | 12
ChangeLog | 209 ++++++++
configure.ac | 9
debian/changelog | 18
debian/control | 2
debian/rules | 4
debian/upstream/signing-key.asc | 24
debian/watch | 1
man/radeon.man | 3
src/Makefile.am | 1
src/ati_pciids_gen.h | 7
src/cayman_accel.c | 1
src/drmmode_display.c | 17
src/evergreen_accel.c | 1
src/pcidb/ati_pciids.csv | 9
src/r6xx_accel.c | 1
src/radeon.h | 2
src/radeon_chipinfo_gen.h | 7
src/radeon_chipset_gen.h | 7
src/radeon_drm.h | 920 --------------------------------------
src/radeon_exa.c | 1
src/radeon_kms.c | 34 -
src/radeon_pci_chipset_gen.h | 7
src/radeon_pci_device_match_gen.h | 7
src/radeon_vbo.c | 1
src/radeon_video.c | 2
26 files changed, 347 insertions(+), 960 deletions(-)
New commits:
commit f37457d8585662b575bd83c6504e8869f968be79
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Mon Mar 9 10:45:24 2015 +0100
Merge with released debian-unstable. (LP: #1421601)
diff --git a/debian/changelog b/debian/changelog
index f28e423..73dd11c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.5.0-1ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge with released debian-unstable. (LP: #1421601)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Mar 2015 10:44:44 +0100
+
xserver-xorg-video-ati (1:7.5.0-1) unstable; urgency=medium
[ Andreas Boll ]
commit f187ac6c9e6fcc0ba76d2bb51df5915b43fc93b2
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 5 18:58:14 2014 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 8af5d3b..073b9bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ati (1:7.5.0-1) UNRELEASED; urgency=medium
+xserver-xorg-video-ati (1:7.5.0-1) unstable; urgency=medium
[ Andreas Boll ]
* New upstream release.
@@ -8,7 +8,7 @@ xserver-xorg-video-ati (1:7.5.0-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
* Disable silent build rules.
- -- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 02 Oct 2014 17:13:15 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 05 Oct 2014 18:53:26 +0200
xserver-xorg-video-ati (1:7.4.0-2) unstable; urgency=medium
commit 0ceed425a491e9e99457722ebb87e283e93dfc7e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 5 18:53:25 2014 +0200
Disable silent build rules.
diff --git a/debian/changelog b/debian/changelog
index 45ed2eb..8af5d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-ati (1:7.5.0-1) UNRELEASED; urgency=medium
[ Julien Cristau ]
* Let uscan verify tarball signatures.
+ * Disable silent build rules.
-- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 02 Oct 2014 17:13:15 +0200
diff --git a/debian/rules b/debian/rules
index 6d9d6a8..1d87401 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,9 @@
XXV=xserver-xorg-video
override_dh_auto_configure:
- dh_auto_configure --builddirectory=build/ -- --libdir=/usr/lib
+ dh_auto_configure --builddirectory=build/ -- \
+ --libdir=/usr/lib \
+ --disable-silent-rules
# Kill *.la files, and forget no-one:
override_dh_install:
commit 2bcdc17274563005f41c09bde659faf5d79ee1ac
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 5 18:38:38 2014 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 2ff542a..45ed2eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-video-ati (1:7.5.0-1) UNRELEASED; urgency=medium
+ [ Andreas Boll ]
* New upstream release.
* Bump libdrm-dev build-dep to 2.4.58.
+ [ Julien Cristau ]
+ * Let uscan verify tarball signatures.
+
-- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 02 Oct 2014 17:13:15 +0200
xserver-xorg-video-ati (1:7.4.0-2) unstable; urgency=medium
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..7c21240
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,24 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQGiBEUcmfwRBACcBCeMF28Q5hgM7wvaF2Tq7KYjU1RSg5KE4zqoaH5KH4H+Rtvh
+Wqyh4REAiGGcYowSDtRZN/22/gflf7PvHIRPz2NrrVJ9zTYupoSE/CR7khA9xgnj
+6DvntwZ9SBLR4ZlnyQxd650xTlntVfki8k+4rr2TyEczF7RmqLG5i9ddcwCgzMw9
+u1bbIYiMQ+zkFq6CmIVYB+0EAITS9XD84t37DxXdZyJIKNoOh7jH0iKwtXBz+jcP
+3TFcEKN58lfodTo++3Z3l6ZNrhP1kVQFrYUPYujBKVQ05omdZVDl6xHcxo7/KUws
+of4xZAGXkTsf6jPLIOydqZAuldzUcQCK/ulDswg907WfEVnth6Ad3gv5KqF3DkSp
+iyb1A/wI+Ph5/QqMkpFveYfgstu/5WqaUcn5o8skMhgxCBn7cnIR+Mhwt0cnU5P9
+ZdfDxRgIVzGTX728lHNdHf7dpT+0t2WuuY7rMZzfEiAwmfxs9Y/Qs+3dTgDx/f7K
+BYYOpe7eo0QSvYDn/Uh2FfjWXE0J9LoWcKglAk2BMopWDigdjLQkQWxleCBEZXVj
+aGVyIDxhbGV4ZGV1Y2hlckBnbWFpbC5jb20+iF4EExECAB4FAkUcmfwCGwMGCwkI
+BwMCAxUCAwMWAgECHgECF4AACgkQm07k+YR03kCniwCgphi/DUYtemAoDipVO6IT
+fDqLOhMAn0XjoWLPnlDd7DznKVwuuK+yind1uQENBEUcmf4QBACw+tOabCw1J+lk
+2q66GnlOavqqCpgrCCRjSeR7Zf7qFu2nJoY/AoW/fhXn+CerEITjopH9vTIjAWKm
+kaHd0uFSA9xYR4IEV1qIct9i6vAvxkk8jQII/kLWiUqjWU0x1YoR68RNBhdZ1vxV
+RHzcIo+mo4aeXs8EJuS3u+TjZeUiSwADBgQAo+1Fg7SK9iEGqHkvpq15MLmV1fA5
+DiXFXVJfsq43MxDl/Lqn4xabXdVieXT6mwtnE7w2iueG3Ja7rEBO0DLoMng7u999
+49a3d6BJq6emFr4jk9YlzroQReqvVIQ7xwfEeAQVL9mVg/6eggY3S9a32QoZHXOp
+CQ/a/MFkGtUi3PiISQQYEQIACQUCRRyZ/gIbDAAKCRCbTuT5hHTeQBEcAJsHHZeJ
+F3qnDbP3c7nBnXtfsOSDQgCgl4RWePUa/QXjU0DL/NKn2zldhNE=
+=9tgc
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index c1d0a2b..8cd64ad 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-ati
version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-ati-(.*)\.tar\.gz
commit 5069ad4d89aec62b491e5deb1ce3aa9060db93ad
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Oct 2 17:24:33 2014 +0200
Bump libdrm-dev to 2.4.58 and add changelogs
diff --git a/ChangeLog b/ChangeLog
index 32d2d1d..a45a8d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,212 @@
+commit 068a59e010ce6bfcd54f5a18cc08c55c54b8618d
+Author: Alex Deucher <alexander.deucher@amd.com>
+Date: Wed Oct 1 23:38:52 2014 -0400
+
+ radeon: bump version for release
+
+ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 5fee565e420d3efbf72fdf4f63c3d5d93d8ceddb
+Author: Alex Deucher <alexander.deucher@amd.com>
+Date: Wed Oct 1 23:36:31 2014 -0400
+
+ radeon: require libdrm_radeon 2.4.58 for latest SI/CI pci ids
+
+ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 56c7fb8ada4cd9cf096c6b06a8d368d286d74e68
+Author: Thomas DeRensis <tderensis@gmail.com>
+Date: Wed Sep 10 21:20:32 2014 -0400
+
+ radeon: fix build warnings regarding const qualifier
+
+ Signed-off-by: Thomas DeRensis <tderensis@gmail.com>
+
+commit b9a9b244336ed50d7df4f36135f875a3bb6ca948
+Author: Thomas DeRensis <tderensis@gmail.com>
+Date: Thu Sep 4 21:45:19 2014 -0400
+
+ radeon: fix a leak in radeon_vbo_get_bo()
+
+ The dma_bo struct was never freed in the error path. Reported by cppcheck.
+
+ Signed-off-by: Thomas DeRensis <tderensis@gmail.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit ba5fcc4d6b6eae3f2c55c6229a53d24d160789c1
+Author: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu Aug 21 11:32:45 2014 -0400
+
+ radeon/kms: fix mullins pci id
+
+ strange errant change from:
+ 39fef269f521c92a2a31c80447e9401bacb3797a
+
+ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit efef34930650d6d80f7b527f4cee76d9e5954ace
+Author: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu Aug 21 11:30:17 2014 -0400
+
+ radeon/kms: add new SI pci ids
+
+ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 39fef269f521c92a2a31c80447e9401bacb3797a
+Author: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu Aug 21 11:27:49 2014 -0400
+
+ radeon/kms: add new CIK pci ids
+
+ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 7dab6b2fe9cf690b0dae1c127d0374322bd8278e
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Aug 20 17:51:35 2014 +0900
+
+ Revert "glamor: Set environment variable RADEON_THREAD=0"
+
+ This reverts commit 4b5060f357a3cb248c9359c92c1e9c42ef6434c8.
+
+ Further testing shows that disabling the thread is only a moderate win in
+ some cases, but a much bigger loss in some other cases.
+
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 1ff383360886c5cee1bb75abcc20675aca0336a6
+Author: Alex Deucher <alexander.deucher@amd.com>
+Date: Tue Aug 12 12:27:12 2014 -0400
+
+ radeon: fix warnings when building against older xservers
+
+ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 94202cbfbca05a503acdc1cca2f8409d141173af
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date: Fri Aug 1 21:55:40 2014 +0200
+
+ radeon: enable hawaii accel conditionally (v3)
+
+ Only if the kernel has the new CP firmware.
+
+ v2: check value of ACCEL_WORKING2
+ v3 (Andreas Boll):
+ - check for value 2 or 3 of ACCEL_WORKING2
+ - update man page
+
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (v2)
+ Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
+
+commit 03930edd49f6b8a8d79910c7be5408b47db9649b
+Author: Andreas Boll <andreas.boll.dev@gmail.com>
+Date: Mon Aug 4 16:23:13 2014 +0200
+
+ radeon: remove definitions already present in radeon_drm.h
+
+ Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
+
+commit 91849fba0742ef61ba327e71fc3ce8f754af0a6f
+Author: Andreas Boll <andreas.boll.dev@gmail.com>
+Date: Mon Aug 4 16:23:12 2014 +0200
+
+ radeon: drop radeon_drm.h
+
+ Now we use libdrm's radeon_drm.h.
+
+ Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
+
+commit b4658901bf1d619f8ff9b5f94344894f935ee6c8
+Author: Andreas Boll <andreas.boll.dev@gmail.com>
+Date: Mon Aug 4 16:23:11 2014 +0200
+
+ radeon: move RADEON_TILING_{MASK, LINEAR} from radeon_drm.h to radeon.h
+
+ This allows us to drop radeon_drm.h from xf86-video-ati and use instead
+ radeon_drm.h from libdrm.
+
+ Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
+
+commit 656bae7361c1e018553ef6d6d8c9efad616a4513
+Author: Andreas Boll <andreas.boll.dev@gmail.com>
+Date: Mon Aug 4 16:23:10 2014 +0200
+
+ radeon: drop redundant radeon_drm.h includes
+
+ Already included via radeon.h.
+
+ Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
+
+commit fbf575cb010e558a87fad0de45660738c8180896
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Jul 30 17:03:24 2014 +0900
+
+ Add Emacs .dir-local.el file
+
+ Based on the one from the Gallium radeon winsys, but enabling tabs for
+ indentation.
+
+commit 4b5060f357a3cb248c9359c92c1e9c42ef6434c8
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Thu Jun 19 18:27:59 2014 +0900
+
+ glamor: Set environment variable RADEON_THREAD=0
+
+ Reviewed-by: Marek Olšák <marek.olsak@amd.com>
+
+commit 9b54caf6509a9c02dd17c9c43d6be8f7ddc98054
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Mon Jul 28 15:55:12 2014 +0200
+
+ configure: Include xorg-server.h before
glamor.h
+
+ glamor.h cannot be included without first including xorg-server.h, this also
+ applies to including it from configure snippets.
+
+ Without this the configure glamor checks fail on systems with the latest
+ glibc, throwing this error:
+
+ In file included from /usr/include/xorg/misc.h:115:0,
+ from /usr/include/xorg/screenint.h:50,
+ from /usr/include/xorg/scrnintstr.h:50,
+ from /usr/include/xorg/glamor.h:32,
+ from conftest.c:61:
+ /usr/include/xorg/os.h:579:2: error: expected identifier or '(' before
+ '__exten
+ strndup(const char *str, size_t n);
+ ^
+
+ This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h),
+ causing os.h to redefine it.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit c4ae0e2cbcc0e2ebf9f13ee92d59b5120254a1dc
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Mon Jun 30 10:20:12 2014 +0900
+
+ Handle CRTC DPMS from output DPMS hooks
+
+ This fixes at least two issues:
+
+ The CRTC DPMS hook isn't called after a modeset, so the vertical blank
+ interrupt emulation code considered the CRTC disabled after a modeset. As
+ a side effect, page flipping was no longer used after a modeset.
+
+ This change also makes sure the vertical blank interrupt emulation code
+ runs before the hardware CRTC is disabled and after it's enabled from the
+ output DPMS hook. The wrong order could cause gnome-shell to hang after
+ a suspend/resume and/or DPMS off/on cycle.
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit c0c3cac8613e31e310242695d0955b452f116e25
+Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Wed Jun 25 16:21:57 2014 +0200
+
+ bump version post release
+
commit 906a0ec9224146098bb4581486129d2934d36495
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jun 25 16:10:21 2014 +0200
diff --git a/debian/changelog b/debian/changelog
index 2383f14..2ff542a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-ati (1:7.5.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Bump libdrm-dev build-dep to 2.4.58.
-- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 02 Oct 2014 17:13:15 +0200
diff --git a/debian/control b/debian/control
index a468fb2..e2970bd 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2),
x11proto-render-dev,
- libdrm-dev (>= 2.4.54) [!hurd-i386],
+ libdrm-dev (>= 2.4.58) [!hurd-i386],
x11proto-dri2-dev,
x11proto-xf86dri-dev,
libudev-dev [linux-any],
commit c4f5de65fe0e550d8f5c555bd1b2e0b7c231a990
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Oct 2 17:13:46 2014 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index e21f481..2383f14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.5.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Thu, 02 Oct 2014 17:13:15 +0200
+
xserver-xorg-video-ati (1:7.4.0-2) unstable; urgency=medium
* Upload to unstable.
commit 068a59e010ce6bfcd54f5a18cc08c55c54b8618d
Author: Alex Deucher <alexander.deucher@amd.com>
Date: Wed Oct 1 23:38:52 2014 -0400
radeon: bump version for release
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/configure.ac b/configure.ac
index e4aaab2..d30efaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-ati],
- [7.4.99],
+ [7.5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-ati])
commit 5fee565e420d3efbf72fdf4f63c3d5d93d8ceddb
Author: Alex Deucher <alexander.deucher@amd.com>
Date: Wed Oct 1 23:36:31 2014 -0400
radeon: require libdrm_radeon 2.4.58 for latest SI/CI pci ids
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/configure.ac b/configure.ac
index e74a0a2..e4aaab2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for libraries.
-PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.54])
+PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.58])
PKG_CHECK_MODULES(LIBDRM_RADEON, [libdrm_radeon])
# Obtain compiler/linker options for the driver dependencies
commit 56c7fb8ada4cd9cf096c6b06a8d368d286d74e68
Author: Thomas DeRensis <tderensis@gmail.com>
Date: Wed Sep 10 21:20:32 2014 -0400
radeon: fix build warnings regarding const qualifier
Signed-off-by: Thomas DeRensis <tderensis@gmail.com>
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 6f0f1a1..1703349 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1209,7 +1209,7 @@ Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
RADEONInfoPtr info = RADEONPTR(pScrn);
int subPixelOrder = SubPixelUnknown;
- char* s;
+ const char *s;
void *front_ptr;
pScrn->fbOffset = 0;
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 5349d11..cbfd554 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -188,7 +188,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
if(texturedAdaptor) {
- XF86MCAdaptorPtr xvmcAdaptor = RADEONCreateAdaptorXvMC(pScreen, texturedAdaptor->name);
+ XF86MCAdaptorPtr xvmcAdaptor = RADEONCreateAdaptorXvMC(pScreen, (char *)texturedAdaptor->name);
if(xvmcAdaptor) {
if(!xf86XvMCScreenInit(pScreen, 1, &xvmcAdaptor))
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[XvMC] Failed to initialize extension.\n");
commit b9a9b244336ed50d7df4f36135f875a3bb6ca948
Author: Thomas DeRensis <tderensis@gmail.com>
Date: Thu Sep 4 21:45:19 2014 -0400
radeon: fix a leak in radeon_vbo_get_bo()
The dma_bo struct was never freed in the error path. Reported by cppcheck.
Signed-off-by: Thomas DeRensis <tderensis@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
diff --git a/src/radeon_vbo.c b/src/radeon_vbo.c
index 1924772..6b0d278 100644
--- a/src/radeon_vbo.c
+++ b/src/radeon_vbo.c
@@ -185,6 +185,7 @@ again_alloc:
if (!dma_bo->bo) {
ErrorF("failure to allocate DMA BO\n");
+ free(dma_bo);
return NULL;
}
insert_at_head(&accel_state->bo_reserved, dma_bo);
commit ba5fcc4d6b6eae3f2c55c6229a53d24d160789c1
Author: Alex Deucher <alexander.deucher@amd.com>
Date: Thu Aug 21 11:32:45 2014 -0400
radeon/kms: fix mullins pci id
strange errant change from:
39fef269f521c92a2a31c80447e9401bacb3797a
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index e59cd59..d867fa7 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -733,7 +733,7 @@
#define PCI_CHIP_MULLINS_9852 0x9852
#define PCI_CHIP_MULLINS_9853 0x9853
#define PCI_CHIP_MULLINS_9854 0x9854
-#define PCI_CHIP_MULLINS_9855 0x9845
+#define PCI_CHIP_MULLINS_9855 0x9855
#define PCI_CHIP_MULLINS_9856 0x9856
#define PCI_CHIP_MULLINS_9857 0x9857
#define PCI_CHIP_MULLINS_9858 0x9858
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index a3168a3..1c92f5b 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -734,7 +734,7 @@
"0x9852","MULLINS_9852","MULLINS",1,1,,,1,"MULLINS"
"0x9853","MULLINS_9853","MULLINS",1,1,,,1,"MULLINS"
"0x9854","MULLINS_9854","MULLINS",1,1,,,1,"MULLINS"
-"0x9845","MULLINS_9855","MULLINS",1,1,,,1,"MULLINS"
+"0x9855","MULLINS_9855","MULLINS",1,1,,,1,"MULLINS"
"0x9856","MULLINS_9856","MULLINS",1,1,,,1,"MULLINS"
"0x9857","MULLINS_9857","MULLINS",1,1,,,1,"MULLINS"
"0x9858","MULLINS_9858","MULLINS",1,1,,,1,"MULLINS"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index dc9866f..40577c9 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -653,7 +653,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x9852, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9853, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9854, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
- { 0x9845, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9855, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9856, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9857, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9858, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
commit efef34930650d6d80f7b527f4cee76d9e5954ace
Author: Alex Deucher <alexander.deucher@amd.com>
Date: Thu Aug 21 11:30:17 2014 -0400
radeon/kms: add new SI pci ids
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index c552678..e59cd59 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -668,6 +668,7 @@
#define PCI_CHIP_VERDE_6829 0x6829
#define PCI_CHIP_VERDE_682A 0x682A
#define PCI_CHIP_VERDE_682B 0x682B
+#define PCI_CHIP_VERDE_682C 0x682C
#define PCI_CHIP_VERDE_682D 0x682D
#define PCI_CHIP_VERDE_682F 0x682F
#define PCI_CHIP_VERDE_6830 0x6830
@@ -683,8 +684,11 @@
#define PCI_CHIP_OLAND_6601 0x6601
#define PCI_CHIP_OLAND_6602 0x6602
#define PCI_CHIP_OLAND_6603 0x6603
+#define PCI_CHIP_OLAND_6604 0x6604
+#define PCI_CHIP_OLAND_6605 0x6605
#define PCI_CHIP_OLAND_6606 0x6606
#define PCI_CHIP_OLAND_6607 0x6607
+#define PCI_CHIP_OLAND_6608 0x6608
#define PCI_CHIP_OLAND_6610 0x6610
#define PCI_CHIP_OLAND_6611 0x6611
#define PCI_CHIP_OLAND_6613 0x6613
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index e9db795..a3168a3 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -669,6 +669,7 @@
"0x6829","VERDE_6829","VERDE",,,,,,"VERDE"
"0x682A","VERDE_682A","VERDE",1,,,,,"VERDE"
"0x682B","VERDE_682B","VERDE",1,,,,,"VERDE"
+"0x682C","VERDE_682C","VERDE",,,,,,"VERDE"
"0x682D","VERDE_682D","VERDE",1,,,,,"VERDE"
"0x682F","VERDE_682F","VERDE",1,,,,,"VERDE"
"0x6830","VERDE_6830","VERDE",1,,,,,"VERDE"
@@ -684,8 +685,11 @@
"0x6601","OLAND_6601","OLAND",1,,,,,"OLAND"
"0x6602","OLAND_6602","OLAND",1,,,,,"OLAND"
"0x6603","OLAND_6603","OLAND",1,,,,,"OLAND"
+"0x6604","OLAND_6604","OLAND",1,,,,,"OLAND"
+"0x6605","OLAND_6605","OLAND",1,,,,,"OLAND"
"0x6606","OLAND_6606","OLAND",1,,,,,"OLAND"
"0x6607","OLAND_6607","OLAND",1,,,,,"OLAND"
+"0x6608","OLAND_6608","OLAND",,,,,,"OLAND"
"0x6610","OLAND_6610","OLAND",,,,,,"OLAND"
"0x6611","OLAND_6611","OLAND",,,,,,"OLAND"
"0x6613","OLAND_6613","OLAND",,,,,,"OLAND"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index c853d41..dc9866f 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -588,6 +588,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x6829, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
{ 0x682A, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x682B, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
+ { 0x682C, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
{ 0x682D, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x682F, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x6830, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
@@ -603,8 +604,11 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x6601, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
{ 0x6602, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
{ 0x6603, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6604, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6605, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
{ 0x6606, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
{ 0x6607, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6608, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
{ 0x6610, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
{ 0x6611, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
{ 0x6613, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 3b5edd4..e3f23b6 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -588,6 +588,7 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_VERDE_6829, "VERDE" },
{ PCI_CHIP_VERDE_682A, "VERDE" },
{ PCI_CHIP_VERDE_682B, "VERDE" },
+ { PCI_CHIP_VERDE_682C, "VERDE" },
{ PCI_CHIP_VERDE_682D, "VERDE" },
{ PCI_CHIP_VERDE_682F, "VERDE" },
{ PCI_CHIP_VERDE_6830, "VERDE" },
@@ -603,8 +604,11 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_OLAND_6601, "OLAND" },
{ PCI_CHIP_OLAND_6602, "OLAND" },
{ PCI_CHIP_OLAND_6603, "OLAND" },
+ { PCI_CHIP_OLAND_6604, "OLAND" },
+ { PCI_CHIP_OLAND_6605, "OLAND" },
{ PCI_CHIP_OLAND_6606, "OLAND" },
{ PCI_CHIP_OLAND_6607, "OLAND" },
+ { PCI_CHIP_OLAND_6608, "OLAND" },
{ PCI_CHIP_OLAND_6610, "OLAND" },
{ PCI_CHIP_OLAND_6611, "OLAND" },
{ PCI_CHIP_OLAND_6613, "OLAND" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index a7d8613..bd68920 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -588,6 +588,7 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_VERDE_6829, PCI_CHIP_VERDE_6829, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_682A, PCI_CHIP_VERDE_682A, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_682B, PCI_CHIP_VERDE_682B, RES_SHARED_VGA },
+ { PCI_CHIP_VERDE_682C, PCI_CHIP_VERDE_682C, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_682D, PCI_CHIP_VERDE_682D, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_682F, PCI_CHIP_VERDE_682F, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6830, PCI_CHIP_VERDE_6830, RES_SHARED_VGA },
@@ -603,8 +604,11 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_OLAND_6601, PCI_CHIP_OLAND_6601, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6602, PCI_CHIP_OLAND_6602, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6603, PCI_CHIP_OLAND_6603, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6604, PCI_CHIP_OLAND_6604, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6605, PCI_CHIP_OLAND_6605, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6606, PCI_CHIP_OLAND_6606, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6607, PCI_CHIP_OLAND_6607, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6608, PCI_CHIP_OLAND_6608, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6610, PCI_CHIP_OLAND_6610, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6611, PCI_CHIP_OLAND_6611, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6613, PCI_CHIP_OLAND_6613, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index a4ccb62..eaf280a 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -588,6 +588,7 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6829, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682A, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682B, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682C, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682D, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682F, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6830, 0 ),
@@ -603,8 +604,11 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6601, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6602, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6603, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6604, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6605, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6606, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6607, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6608, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6610, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6611, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6613, 0 ),
commit 39fef269f521c92a2a31c80447e9401bacb3797a
Author: Alex Deucher <alexander.deucher@amd.com>
Date: Thu Aug 21 11:27:49 2014 -0400
radeon/kms: add new CIK pci ids
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index 94c8fc8..c552678 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -700,6 +700,8 @@
#define PCI_CHIP_HAINAN_666F 0x666F
#define PCI_CHIP_BONAIRE_6640 0x6640
#define PCI_CHIP_BONAIRE_6641 0x6641
+#define PCI_CHIP_BONAIRE_6646 0x6646
+#define PCI_CHIP_BONAIRE_6647 0x6647
#define PCI_CHIP_BONAIRE_6649 0x6649
#define PCI_CHIP_BONAIRE_6650 0x6650
#define PCI_CHIP_BONAIRE_6651 0x6651
@@ -727,7 +729,7 @@
#define PCI_CHIP_MULLINS_9852 0x9852
#define PCI_CHIP_MULLINS_9853 0x9853
#define PCI_CHIP_MULLINS_9854 0x9854
-#define PCI_CHIP_MULLINS_9855 0x9855
+#define PCI_CHIP_MULLINS_9855 0x9845
#define PCI_CHIP_MULLINS_9856 0x9856
#define PCI_CHIP_MULLINS_9857 0x9857
#define PCI_CHIP_MULLINS_9858 0x9858
@@ -756,6 +758,7 @@
#define PCI_CHIP_KAVERI_1315 0x1315
#define PCI_CHIP_KAVERI_1316 0x1316
#define PCI_CHIP_KAVERI_1317 0x1317
+#define PCI_CHIP_KAVERI_1318 0x1318
#define PCI_CHIP_KAVERI_131B 0x131B
#define PCI_CHIP_KAVERI_131C 0x131C
#define PCI_CHIP_KAVERI_131D 0x131D
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index e334230..e9db795 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -701,6 +701,8 @@
"0x666F","HAINAN_666F","HAINAN",1,,,,,"HAINAN"
"0x6640","BONAIRE_6640","BONAIRE",1,,,,,"BONAIRE"
"0x6641","BONAIRE_6641","BONAIRE",1,,,,,"BONAIRE"
+"0x6646","BONAIRE_6646","BONAIRE",1,,,,,"BONAIRE"
+"0x6647","BONAIRE_6647","BONAIRE",1,,,,,"BONAIRE"
"0x6649","BONAIRE_6649","BONAIRE",,,,,,"BONAIRE"
"0x6650","BONAIRE_6650","BONAIRE",,,,,,"BONAIRE"
"0x6651","BONAIRE_6651","BONAIRE",,,,,,"BONAIRE"
@@ -757,6 +759,7 @@
"0x1315","KAVERI_1315","KAVERI",,1,,,1,"KAVERI"
"0x1316","KAVERI_1316","KAVERI",,1,,,1,"KAVERI"
"0x1317","KAVERI_1317","KAVERI",1,1,,,1,"KAVERI"
+"0x1318","KAVERI_1318","KAVERI",1,1,,,1,"KAVERI"
"0x131B","KAVERI_131B","KAVERI",,1,,,1,"KAVERI"
"0x131C","KAVERI_131C","KAVERI",,1,,,1,"KAVERI"
"0x131D","KAVERI_131D","KAVERI",,1,,,1,"KAVERI"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 4f6e3bc..c853d41 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -620,6 +620,8 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x666F, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
{ 0x6640, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
{ 0x6641, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
+ { 0x6646, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
+ { 0x6647, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
{ 0x6649, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
{ 0x6650, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
{ 0x6651, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
@@ -647,7 +649,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x9852, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9853, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9854, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
- { 0x9855, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9845, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9856, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9857, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9858, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
@@ -676,6 +678,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x1315, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
{ 0x1316, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
{ 0x1317, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x1318, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
{ 0x131B, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
{ 0x131C, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
{ 0x131D, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 03a413e..3b5edd4 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -620,6 +620,8 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_HAINAN_666F, "HAINAN" },
{ PCI_CHIP_BONAIRE_6640, "BONAIRE" },
{ PCI_CHIP_BONAIRE_6641, "BONAIRE" },
+ { PCI_CHIP_BONAIRE_6646, "BONAIRE" },
+ { PCI_CHIP_BONAIRE_6647, "BONAIRE" },
{ PCI_CHIP_BONAIRE_6649, "BONAIRE" },
{ PCI_CHIP_BONAIRE_6650, "BONAIRE" },
{ PCI_CHIP_BONAIRE_6651, "BONAIRE" },
@@ -676,6 +678,7 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_KAVERI_1315, "KAVERI" },
{ PCI_CHIP_KAVERI_1316, "KAVERI" },
{ PCI_CHIP_KAVERI_1317, "KAVERI" },
+ { PCI_CHIP_KAVERI_1318, "KAVERI" },
{ PCI_CHIP_KAVERI_131B, "KAVERI" },
{ PCI_CHIP_KAVERI_131C, "KAVERI" },
{ PCI_CHIP_KAVERI_131D, "KAVERI" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index a9b186c..a7d8613 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -620,6 +620,8 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_HAINAN_666F, PCI_CHIP_HAINAN_666F, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_6640, PCI_CHIP_BONAIRE_6640, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_6641, PCI_CHIP_BONAIRE_6641, RES_SHARED_VGA },
+ { PCI_CHIP_BONAIRE_6646, PCI_CHIP_BONAIRE_6646, RES_SHARED_VGA },
+ { PCI_CHIP_BONAIRE_6647, PCI_CHIP_BONAIRE_6647, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_6649, PCI_CHIP_BONAIRE_6649, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_6650, PCI_CHIP_BONAIRE_6650, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_6651, PCI_CHIP_BONAIRE_6651, RES_SHARED_VGA },
@@ -676,6 +678,7 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_KAVERI_1315, PCI_CHIP_KAVERI_1315, RES_SHARED_VGA },
{ PCI_CHIP_KAVERI_1316, PCI_CHIP_KAVERI_1316, RES_SHARED_VGA },
{ PCI_CHIP_KAVERI_1317, PCI_CHIP_KAVERI_1317, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1318, PCI_CHIP_KAVERI_1318, RES_SHARED_VGA },
{ PCI_CHIP_KAVERI_131B, PCI_CHIP_KAVERI_131B, RES_SHARED_VGA },
{ PCI_CHIP_KAVERI_131C, PCI_CHIP_KAVERI_131C, RES_SHARED_VGA },
{ PCI_CHIP_KAVERI_131D, PCI_CHIP_KAVERI_131D, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index a73d9c1..a4ccb62 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -620,6 +620,8 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_666F, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6640, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6641, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6646, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6647, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6649, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6650, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6651, 0 ),
@@ -676,6 +678,7 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1315, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1316, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1317, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1318, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_131B, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_131C, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_131D, 0 ),
commit 7dab6b2fe9cf690b0dae1c127d0374322bd8278e
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Aug 20 17:51:35 2014 +0900
Revert "glamor: Set environment variable RADEON_THREAD=0"
This reverts commit 4b5060f357a3cb248c9359c92c1e9c42ef6434c8.
Further testing shows that disabling the thread is only a moderate win in
some cases, but a much bigger loss in some other cases.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index 02fa658..210ddcf 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -132,16 +132,6 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
"Incompatible glamor version, required >= 0.3.0.\n");
return FALSE;
} else {
- /* This prevents the Gallium radeon winsys from spawning
- * a separate thread for submitting command streams to
- * the kernel. Improves scores of at least gtkperf and
- * x11perf -putimage/-shmput/-getimage/-shmget, probably
- * because glamor causes too many command stream flushes
- * / too much synchronization with pending command
- * streams for the separate thread to pay off.
- */
- setenv("RADEON_THREAD", "0", 0);
-
if (glamor_egl_init(scrn, info->dri2.drm_fd)) {
xf86DrvMsg(scrn->scrnIndex, X_INFO,
"glamor detected, initialising EGL layer.\n");
commit 1ff383360886c5cee1bb75abcc20675aca0336a6
Author: Alex Deucher <alexander.deucher@amd.com>
Date: Tue Aug 12 12:27:12 2014 -0400
radeon: fix warnings when building against older xservers
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 171d919..6f0f1a1 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -584,7 +584,9 @@ static Bool RADEONPreInitChipType_KMS(ScrnInfoPtr pScrn)
static int radeon_get_drm_master_fd(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
+#ifdef XF86_PDEV_SERVER_FD
RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+#endif
struct pci_device *dev = info->PciInfo;
char *busid;
int fd;
@@ -1116,7 +1118,9 @@ static Bool RADEONSaveScreen_KMS(ScreenPtr pScreen, int mode)
static Bool radeon_set_drm_master(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
+#ifdef XF86_PDEV_SERVER_FD
RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+#endif
int err;
#ifdef XF86_PDEV_SERVER_FD
@@ -1135,9 +1139,9 @@ static Bool radeon_set_drm_master(ScrnInfoPtr pScrn)
static void radeon_drop_drm_master(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
+#ifdef XF86_PDEV_SERVER_FD
RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
-#ifdef XF86_PDEV_SERVER_FD
if (pRADEONEnt->platform_dev &&
(pRADEONEnt->platform_dev->flags & XF86_PDEV_SERVER_FD))
return;
commit 94202cbfbca05a503acdc1cca2f8409d141173af
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Fri Aug 1 21:55:40 2014 +0200
radeon: enable hawaii accel conditionally (v3)
Only if the kernel has the new CP firmware.
v2: check value of ACCEL_WORKING2
v3 (Andreas Boll):
- check for value 2 or 3 of ACCEL_WORKING2
- update man page
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (v2)
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
diff --git a/man/radeon.man b/man/radeon.man
Reply to: