ChangeLog | 620 ++++++++++++++++++++++++++++++++++++ configure.ac | 30 + debian/changelog | 66 +++ debian/compat | 2 debian/control | 16 debian/rules | 12 man/radeon.man | 28 + src/ati_pciids_gen.h | 51 ++ src/drmmode_display.c | 33 + src/evergreen_accel.c | 2 src/evergreen_exa.c | 20 - src/evergreen_textured_videofuncs.c | 15 src/pcidb/ati_pciids.csv | 51 ++ src/r600_exa.c | 5 src/radeon.h | 23 - src/radeon_bo_helper.c | 2 src/radeon_chipinfo_gen.h | 51 ++ src/radeon_chipset_gen.h | 51 ++ src/radeon_dri2.c | 41 +- src/radeon_drm.h | 2 src/radeon_exa_funcs.c | 5 src/radeon_glamor.c | 42 ++ src/radeon_glamor.h | 4 src/radeon_kms.c | 147 ++++++-- src/radeon_pci_chipset_gen.h | 51 ++ src/radeon_pci_device_match_gen.h | 51 ++ src/radeon_probe.c | 15 src/radeon_probe.h | 11 src/radeon_video.c | 9 29 files changed, 1300 insertions(+), 156 deletions(-)
New commits: commit 58bf373c8df237c2893284b0952b4716eff26878 Author: Julien Cristau <jcris...@debian.org> Date: Mon Jun 16 19:27:38 2014 +0200 Upload to experimental diff --git a/debian/changelog b/debian/changelog index 4778694..4357fc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xserver-xorg-video-ati (1:7.3.0-2) UNRELEASED; urgency=medium +xserver-xorg-video-ati (1:7.3.0-2) experimental; urgency=medium * New upstream snapshot. * Build against xserver 1.16 rc, enable glamor acceleration. * Remove Cyril from Uploaders. * Bump libdrm build-dep to 2.4.54 per configure.ac. - -- Julien Cristau <jcris...@debian.org> Mon, 16 Jun 2014 19:20:02 +0200 + -- Julien Cristau <jcris...@debian.org> Mon, 16 Jun 2014 19:27:22 +0200 xserver-xorg-video-ati (1:7.3.0-1) unstable; urgency=low commit 41913e2d124e2a27deddeb3890962a6fb0586511 Author: Julien Cristau <jcris...@debian.org> Date: Mon Jun 16 19:23:56 2014 +0200 Bump libdrm build-dep to 2.4.54 per configure.ac. diff --git a/debian/changelog b/debian/changelog index 699a8ad..4778694 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-video-ati (1:7.3.0-2) UNRELEASED; urgency=medium * New upstream snapshot. * Build against xserver 1.16 rc, enable glamor acceleration. * Remove Cyril from Uploaders. + * Bump libdrm build-dep to 2.4.54 per configure.ac. -- Julien Cristau <jcris...@debian.org> Mon, 16 Jun 2014 19:20:02 +0200 diff --git a/debian/control b/debian/control index 245f8f3..a468fb2 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.46) [!hurd-i386], + libdrm-dev (>= 2.4.54) [!hurd-i386], x11proto-dri2-dev, x11proto-xf86dri-dev, libudev-dev [linux-any], commit 89f0ba5f899e3fbad7c1baa673313c7f6f348bbc Author: Julien Cristau <jcris...@debian.org> Date: Mon Jun 16 19:21:24 2014 +0200 Remove Cyril from Uploaders. diff --git a/debian/changelog b/debian/changelog index a50d733..699a8ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-ati (1:7.3.0-2) UNRELEASED; urgency=medium * New upstream snapshot. * Build against xserver 1.16 rc, enable glamor acceleration. + * Remove Cyril from Uploaders. -- Julien Cristau <jcris...@debian.org> Mon, 16 Jun 2014 19:20:02 +0200 diff --git a/debian/control b/debian/control index f9af851..245f8f3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-ati Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: Drew Parsons <dpars...@debian.org>, Cyril Brulebois <k...@debian.org> +Uploaders: Drew Parsons <dpars...@debian.org>, Build-Depends: debhelper (>= 9), dh-autoreconf, commit d05d3460f9783c8bea9a5f3447d631931d79318c Author: Julien Cristau <jcris...@debian.org> Date: Mon Jun 16 19:21:01 2014 +0200 Build against xserver 1.16 rc, enable glamor acceleration. diff --git a/debian/changelog b/debian/changelog index dfa0a46..a50d733 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-ati (1:7.3.0-2) UNRELEASED; urgency=medium * New upstream snapshot. + * Build against xserver 1.16 rc, enable glamor acceleration. -- Julien Cristau <jcris...@debian.org> Mon, 16 Jun 2014 19:20:02 +0200 diff --git a/debian/control b/debian/control index 1801a06..f9af851 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: dh-autoreconf, quilt, pkg-config, - xserver-xorg-dev (>= 2:1.12), + xserver-xorg-dev (>= 2:1.15.99), x11proto-gl-dev, x11proto-xext-dev, x11proto-core-dev, diff --git a/debian/rules b/debian/rules index d76a0b9..6d9d6a8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ XXV=xserver-xorg-video override_dh_auto_configure: - dh_auto_configure --builddirectory=build/ -- --libdir=/usr/lib --disable-glamor + dh_auto_configure --builddirectory=build/ -- --libdir=/usr/lib # Kill *.la files, and forget no-one: override_dh_install: commit dd4a32212e5a33ee5100f6d76f558f2568345686 Author: Julien Cristau <jcris...@debian.org> Date: Mon Jun 16 19:20:14 2014 +0200 New upstream snapshot. diff --git a/ChangeLog b/ChangeLog index 3413e10..9455463 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,623 @@ +commit cc615d06db0332fc6e673b55632bcc7bf957b44b +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jun 4 16:58:53 2014 +0900 + + Rename Option "NoAccel" to "Accel" + + Removes the need for a double negation when forcing acceleration on. + + Note that this change is backwards compatible, as the option parser + automagically handles the 'No' prefix. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 851b2cf8714618843725f6d067915375485ade9d +Author: Adam Jackson <a...@redhat.com> +Date: Wed May 21 09:34:32 2014 -0400 + + kms: Use own thunk function instead of shadowUpdatePackedWeak + + I plan to delete the Weak functions from a future server. + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit b2dba2906f0b2284f17f53fd5251ba0f03d52a8b +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu May 15 16:07:53 2014 +0900 + + Don't disable acceleration on >= SI on attempts to force EXA + + Also make this case clear in the log file: + + (WW) RADEON(0): EXA not supported, using glamor + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit be1469cc23aba46daf3293b3d09c5f2e792e7f42 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Fri May 2 17:48:07 2014 -0400 + + radeon: enable tiling for mullins + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 2ae8e4b8d12f5c9bab6655eb8cd3c5c1d5cfb10e +Author: Samuel Li <samuel...@amd.com> +Date: Tue Nov 12 15:30:42 2013 -0500 + + radeon: add Mullins pci ids. + + Signed-off-by: Samuel Li <samuel...@amd.com> + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 5c86a3461597647224c33d5190b4531aeeb2655f +Author: Samuel Li <samuel...@amd.com> +Date: Thu Apr 17 15:17:28 2014 -0400 + + radeon: add support for Mullins. + + Signed-off-by: Samuel Li <samuel...@amd.com> + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit fdb90ffc50acbb7d5ba0598470f9feeac6ce55fc +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Fri May 2 17:45:45 2014 -0400 + + radeon: require libdrm_radeon 2.4.54 for mullins support + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 06e3c8c53ef4bd159f5864eabf726438d008b49a +Author: Dave Airlie <airl...@redhat.com> +Date: Wed Apr 23 13:39:42 2014 +1000 + + radeon: fix use-after-free in modesetting cleanup + + noticed while looking at something else. + + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + Signed-off-by: Dave Airlie <airl...@redhat.com> + +commit dbac18c361f9e514ecb40d0617f9d68b65a542e0 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Mon Apr 28 17:51:56 2014 +0900 + + Revert "Adapt to load_cursor_argb signature change in xserver 1.15.99.902" + + This reverts commit 48d3dbc8a0d3bfde88f46e402e530438f9317715. + + xserver Git has been updated to be backwards compatible with the + previous API. + +commit c84230d686c078aac1dc98d82153f8b02521b2e1 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Fri Apr 25 09:17:51 2014 +0900 + + dri2: Handle PRIME for source buffer as well in radeon_dri2_copy_region2 + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77810 + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 48d3dbc8a0d3bfde88f46e402e530438f9317715 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Tue Apr 15 17:45:35 2014 +0900 + + Adapt to load_cursor_argb signature change in xserver 1.15.99.902 + + Apart from the compiler warning below, not doing this may result in + accidentally using software cursors. + + ../../src/drmmode_display.c:808:5: warning: initialization from incompatible pointer type [enabled by default] + .load_cursor_argb = drmmode_load_cursor_argb, + ^ + ../../src/drmmode_display.c:808:5: warning: (near initialization for 'drmmode_crtc_funcs.load_cursor_argb') [enabled by default] + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 409786a8f780d78a83bf0bddea5d37117ff6fa39 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Apr 10 11:43:04 2014 +0900 + + glamor: Fix test for creating shared pixmaps + + The pixmap usage hint is not a bitmask in general. The test for + CREATE_PIXMAP_USAGE_SHARED was incorrectly triggering for a glamor internal + usage hint being added in the xserver tree. + + Tested-by: Ed Tomlinson <edt...@gmail.com> + +commit aecf1c4e5f4718adcfb85836830d065d3f4f97a5 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Apr 10 15:10:56 2014 +0900 + + dri2: Fix conflicting CreatePixmap usage flag definitions + + RADEON_CREATE_PIXMAP_TILING_MICRO_SQUARE was the same as + RADEON_CREATE_PIXMAP_DRI2. + + Disambiguate the definitions and rearrange them to try and prevent this + from happening again. + + Tested-by: Ed Tomlinson <edt...@gmail.com> + +commit b50da3b96c212086cb58501dbe988d64f1f35b6d +Author: Hans de Goede <hdego...@redhat.com> +Date: Fri Apr 11 09:44:37 2014 +0200 + + Fix building on older servers without xf86platformBus.h + + Signed-off-by: Hans de Goede <hdego...@redhat.com> + +commit ed0cfbb4fe77146b0b38f777bc28f3a4ea6da07f +Author: Hans de Goede <hdego...@redhat.com> +Date: Fri Mar 7 13:27:30 2014 +0100 + + Add support for server managed fds + + Signed-off-by: Hans de Goede <hdego...@redhat.com> + +commit 3d7861fe112f25874319d4cdc12b745fbcd359cf +Author: Hans de Goede <hdego...@redhat.com> +Date: Mon Mar 17 10:38:13 2014 +0100 + + Add radeon_get_drm_master_fd helper function + + This is a preparation patch for adding server-managed-fd support without it + turning into a goto fest. + + Signed-off-by: Hans de Goede <hdego...@redhat.com> + +commit a63342ad15408071437c80b411d14196f3288aed +Author: Hans de Goede <hdego...@redhat.com> +Date: Mon Mar 17 10:36:55 2014 +0100 + + radeon_open_drm_master get rid of unnecessary goto + + Signed-off-by: Hans de Goede <hdego...@redhat.com> + +commit bdc412044f6ced056cd57320d1b2ee0d967c2191 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Mar 13 16:40:19 2014 +0900 + + Build against glamor in the xserver tree if available + +commit 921a153f9964ca452e1241f76c7f7d653f42ceaf +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Tue Mar 11 12:24:13 2014 -0400 + + update man page to reflect tiling changes for CI parts + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 5eee8a4d5c86bb1cc34d8caf2f2b64b53c241fa5 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Mon Mar 10 16:20:09 2014 -0400 + + radeon: enable tiling by default on CIK + + Now that mesa 10.1 is released, we can enable this by + default for CIK parts. Tiling improves memory bandwidth + utilization. + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 691ec3d99c30111a4789830dfccb6eb5d3c40187 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Mon Mar 10 16:17:34 2014 -0400 + + radeon: require libdrm 2.4.51 + + Required for proper tiling support on CIK parts. + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 515bcf14d514f9dcaaf30fd0bf1ef6dd6ba9a0cd +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Tue Mar 4 12:34:26 2014 +0900 + + Allow enabling glamor on R500 (and R300) class 3D engines as well. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75709 + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit ea6d0affe52d82becadab6fb1c87f9261b0605a2 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Mon Feb 24 13:12:21 2014 +0900 + + Only log debugging output about initializing colormaps when we're doing so + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 8da17f30c70f4494ce22ad781a1cee17041812f3 +Author: Jérôme Glisse <jgli...@redhat.com> +Date: Mon Feb 24 14:50:25 2014 -0500 + + evergreen: fix shader constant upload on ppc + + The number of dword we have to swap is (16*4) ie 16 vectors of + 4 floats each not 16 floats. Never hit this issue before because + we never had more than 4 constant vector. + + Signed-off-by: Jérôme Glisse <jgli...@redhat.com> + +commit cadb6b493942a84bfeb298751dce0dee39257a06 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Fri Feb 21 08:33:21 2014 -0500 + + radeon: don't install colormap handling if there are no crtcs + + Fixes a crash on cards with 0 crtcs. + + Discussion: + http://lists.freedesktop.org/archives/dri-devel/2014-February/054186.html + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 7cd972a85705341dd8306eefc558ed9e5def05d7 +Author: Maarten Lankhorst <maarten.lankho...@canonical.com> +Date: Thu Feb 20 11:14:03 2014 +0100 + + return immediately in preinit when called with PROBE_DETECT + + This fixes a crash with Xorg -configure. + + Bug: + https://bugs.launchpad.net/ubuntu/+source/xorg/+bug/1278046 + + Signed-off-by: Maarten Lankhorst <maarten.lankho...@canonical.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 8de6f7b2f476d3baa9c7e2bb3544e4bafaad46b7 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Fri Jan 24 11:04:30 2014 -0500 + + bump version post release + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 0333f5bda27dc0ec2edc180c7a4dc9a432f13f97 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Fri Jan 24 10:19:49 2014 -0500 + + radeon: bump version for release + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit fc4167f2a85d9cba65078d8fc6f08c7a619ad66e +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Fri Jan 24 10:17:08 2014 -0500 + + Require glamor 0.6.0 + + This is required for Xv support and a number of important + performance improvements. + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit f2a0a5cf6c5a21e2a02280e110a4eb8e6609dace +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jan 22 11:04:42 2014 +0900 + + Don't require the glamoregl module to be pre-loaded with xserver >= 1.15 + + The issues with loading it on demand have been fixed in xserver 1.15. + + Inspired by Jérôme Glisse on IRC. + +commit 3213df16d61302148be0088c8f93c6a5a88558f1 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jan 8 11:30:59 2014 +0900 + + dri2: Make last_vblank_seq local unsigned to match dpms_last_seq + + Without this, I was occasionally running into gnome-shell hangs due to + wildly off vblank sequence values. Doesn't seem to happen anymore with + this change. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit bcc454ea2fb239e13942270faec7801270615b9c +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Mon Jan 6 09:52:50 2014 -0500 + + radeon/exa: Always use a scratch surface for UTS to vram + + If we don't, we may hit a buffer that crosses the + visible vram boundary resulting in a sigbus when the + CPU accesses the buffer beyond the PCI aperture. + This will introduce an extra copy in certain cases. + + This is based on Michel's patch from bug 44099 updated + for all asic families. + + Bug: + https://bugs.freedesktop.org/show_bug.cgi?id=44099 + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 04ef035c9315b4a6fbf1b14720be87cee4099a9f +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Tue Dec 24 15:14:35 2013 -0500 + + drm/radeon: fix SUMO2 pci id + + 0x9649 is sumo2, not sumo. + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit bfbff3b246db509c820df17b8fcf5899882ffcfa +Author: Robert Millan <r...@freebsd.org> +Date: Fri Dec 20 11:03:14 2013 +0000 + + radeon: Restore kernel module load on FreeBSD. + + Since the introduction of a call to drmCheckModesettingSupported() + in radeon_kernel_mode_enabled(), with abort condition if such call + fails, the drmOpen() call in radeon_open_drm_master() no longer + takes the responsibility of loading the radeon kernel module. + + However at least on FreeBSD (and GNU/kFreeBSD), X is still relied + on to load the modules it needs. This commit restores the old + behaviour of loading kernel modules on these systems. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72852 + Signed-off-by: Robert Millan <r...@freebsd.org> + +commit 796c9a0cb587f528326bede11fa3f3eb7d3edaf1 +Author: Robert Millan <r...@freebsd.org> +Date: Fri Dec 20 10:55:09 2013 +0000 + + radeon: Set first parameter of drmOpen() to NULL + + Since the introduction of a call to drmCheckModesettingSupported() + in radeon_kernel_mode_enabled(), with abort condition if such call + fails, the first argument to drmOpen() call in radeon_open_drm_master() + has become a no-op red herring. + + Such argument (a kernel module name) is supposed to result in load + of specified kernel module. However, this will never happen. The + problem is that if the code containing drmOpen() call is reached, it + means that drmCheckModesettingSupported() check has previously + succeeded, which implies the module is already loaded. + + So, drmOpen() will never load a kernel module. But it gives the + impression that it will. + + In order to avoid this confusion, this commit replaces it with NULL, + like xf86-video-intel driver does. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72849 + Signed-off-by: Robert Millan <r...@freebsd.org> + +commit d571d6af70ef27efd1ed6420eb892bdde963ed7a +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Tue Sep 24 11:39:10 2013 -0400 + + radeon/kms: add Hawaii pci ids + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit e38a92e00d015a6b80a1f3a16d58c61f084b066f +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Tue Sep 24 11:35:00 2013 -0400 + + radeon: add support for Hawaii + + Disabled by default until the acceleration code stablizes. + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit e4cd0f4392ea11c93088ad429f36eaaf9bcbf505 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Wed Oct 30 15:21:26 2013 -0400 + + radeon: enable tiling on SI by default (v2) + + Now that mesa 9.2 is out with support for tiling + on SI asics, we can enable it here. Tiling improves + memory bandwidth utilization. + + V2: update man page + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 3b38701a72fa1cad1e4610a2f4330b3da4cc6391 +Author: Vadim Girlin <vadimgir...@gmail.com> +Date: Fri Nov 1 10:36:39 2013 -0400 + + radeon: disable 2D tiling on buffers < 128 pixels + + Seems to run into alignment problems with certain + card configurations. + + bug: + https://bugs.freedesktop.org/show_bug.cgi?id=70675 + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 0c921edf0162fed616cea9d02e168b719243bcd2 +Author: Jerome Glisse <jgli...@redhat.com> +Date: Wed Oct 30 13:01:02 2013 -0400 + + radeon/glamor: with new pixmap for dri2 drawable no need to create new texture + + When creating a new pixmap/bo for dri2 drawable there is no need to create a + new texture, instead the texture associated with the new pixmap should be use + otherwise there is a missmatch between the bo backing the texture for the + drawable and the bo used by dri2 client. + + Signed-off-by: Jerome Glisse <jgli...@redhat.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit f1dc677e79cd7a88d7379a934ebc7d87a3b18805 +Author: Christopher James Halse Rogers <r...@ubuntu.com> +Date: Mon Sep 23 12:25:29 2013 -0700 + + EXA/evergreen: Paranoia around linear tiling. (v2) + + The last two bytes of tiling_mode contain the actual tiling mode; the rest are + extra tiling configuration bits. These configuration bits are not necessarily + zero for a linear buffer, so mask them out before checking for linearity + + v2: Also fix up evergreen_textured_videofuncs.c + + agd5f: remove trailing whitespace + + Signed-off-by: Christopher James Halse Rogers <r...@ubuntu.com> + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 67fb82a3f0759b171fea21b475a70fa825693570 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Tue Oct 1 09:35:30 2013 -0400 + + radeon: fix the non-glamor build harder... + + I need to stop pushing patches first thing in the morning. + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit afc0374fdec3e24ece25805724459463e9a19f5e +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Tue Oct 1 09:32:02 2013 -0400 + + drm/radeon: fix non-glamor build + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 2d791370dfc5570eb74d7a1fb3baf4d4c8ecf243 +Author: Dave Airlie <airl...@redhat.com> +Date: Mon Sep 23 07:57:15 2013 +0100 + + radeon: use glamor Xv support if present. + + This creates adaptors using glamor if possible. + + Signed-off-by: Dave Airlie <airl...@redhat.com> + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit cbb99f659ee7b18ded0008a606e41ded38c1a194 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Mon Sep 30 08:55:16 2013 -0400 + + Revert "radeon: add glamor Xv support (v2)" + + This causes problems if glamor doesn't have Xv support + enabled. I just noticed that Dave has a better version, + so use that instead. + + This reverts commit 4fc1fa920584ace2c84d75af82d06962d0c84ec8. + +commit 4fc1fa920584ace2c84d75af82d06962d0c84ec8 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Thu Sep 26 11:02:55 2013 -0400 + + radeon: add glamor Xv support (v2) + + v2: guard new glamor Xv bits with USE_GLAMOR + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 41dfe327ac8740ac2cd84def96b5947224e422e7 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Thu Sep 26 11:00:49 2013 -0400 + + radeon: fix limit handling for cards with >4G of ram + + We can overflow the 32-bit limit. + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit c45e728107269c6f51599dad4f6a02ccfef703f1 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Sep 18 10:57:52 2013 +0200 + + DRI2: Install client callback only once + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60182 + Acked-by: Alex Deucher <alexander.deuc...@amd.com> + +commit b955ddd0d41801e4ca0c30a70a5d0b27c3f366c8 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Mon Sep 16 10:58:22 2013 -0400 + + glamor: require 0.5.1 or newer + + 0.5.1 fixes a number of issues. + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 282587cd0709850e7bacb1d8307065d95dc2c97d +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Mon Sep 16 09:41:13 2013 -0400 + + radeon: enable glamor by default (v4) + + It's required for newer asics, so enable it by + default. + + v2: update the autoconf help. Require --disable-glamor + to build without glamor support. + v3: default to yes rather than auto + v4: fix help text + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit fdb7563a5cbc736b09c2864b67a93b475c98b2bd +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Thu Jan 24 21:17:11 2013 -0500 + + radeon/kms: add berlin pci ids + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 8927d33f76ee12bc618fecfc59fc7ff1fcedcd5e +Author: Mark Kettenis <kette...@openbsd.org> +Date: Thu Aug 22 10:32:46 2013 -0400 + + Fix shadowfb on big-endian machines + + For shadowfb, the framebuffer needs to have the RADEON_TILING_SURFACE + flag set, otherwise the appropriate byte swapping won't happen. + + See https://bugs.freedesktop.org/show_bug.cgi?id=66663 + + Signed-off-by: Mark Kettenis <kette...@openbsd.org> + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + +commit fa83d3d1636c315bc43dd622d407eb058e3ef976 +Author: Alex Deucher <alexander.deuc...@amd.com> +Date: Tue Aug 20 09:29:23 2013 -0400 + + radeon: disallow glamor on pre-R600 asics + + I'm not sure they can handle the shaders properly, especially + only older parts like r300. + + This will avoid display corruption problems reported by people + using glamor on older asics by falling back to EXA if they try + and enable glamor. + + Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit d0323622ee9b97a5f246baffbb2c65930a78ed14 +Author: Maarten Lankhorst <maarten.lankho...@canonical.com> +Date: Wed Aug 7 11:27:07 2013 +0200 + + bump version post release + + Signed-off-by: Maarten Lankhorst <maarten.lankho...@canonical.com> + commit 9c97cca5c24409ca8447c99f051a12fd2d494e79 Author: Maarten Lankhorst <maarten.lankho...@canonical.com> Date: Wed Aug 7 10:48:17 2013 +0200 diff --git a/debian/changelog b/debian/changelog index 1fbe49d..dfa0a46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-ati (1:7.3.0-2) UNRELEASED; urgency=medium + + * New upstream snapshot. + + -- Julien Cristau <jcris...@debian.org> Mon, 16 Jun 2014 19:20:02 +0200 + xserver-xorg-video-ati (1:7.3.0-1) unstable; urgency=low * New upstream release. commit cc615d06db0332fc6e673b55632bcc7bf957b44b Author: Michel Dänzer <michel.daen...@amd.com> Date: Wed Jun 4 16:58:53 2014 +0900 Rename Option "NoAccel" to "Accel" Removes the need for a double negation when forcing acceleration on. Note that this change is backwards compatible, as the option parser automagically handles the 'No' prefix. Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> diff --git a/man/radeon.man b/man/radeon.man index 65b880c..802f6c2 100644 --- a/man/radeon.man +++ b/man/radeon.man @@ -225,12 +225,12 @@ are supported: Selects software cursor. The default is .B off. .TP -.BI "Option \*qNoAccel\*q \*q" boolean \*q +.BI "Option \*qAccel\*q \*q" boolean \*q Enables or disables all hardware acceleration. .br -The default is to -.B enable -hardware acceleration. +The default is +.B on +except for HAWAII. .TP .BI "Option \*qZaphodHeads\*q \*q" string \*q Specify the RandR output(s) to use with zaphod mode for a particular driver diff --git a/src/radeon.h b/src/radeon.h index 136a430..eac6ed5 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -135,7 +135,7 @@ #endif typedef enum { - OPTION_NOACCEL, + OPTION_ACCEL, OPTION_SW_CURSOR, OPTION_PAGE_FLIP, OPTION_EXA_PIXMAPS, diff --git a/src/radeon_kms.c b/src/radeon_kms.c index ceaf575..707d0c7 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -59,7 +59,7 @@ extern SymTabRec RADEONChipsets[]; static Bool radeon_setup_kernel_mem(ScreenPtr pScreen); const OptionInfoRec RADEONOptions_KMS[] = { - { OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_ACCEL, "Accel", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_PAGE_FLIP, "EnablePageFlip", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_COLOR_TILING, "ColorTiling", OPTV_BOOLEAN, {0}, FALSE }, @@ -499,8 +499,8 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn) info->is_fast_fb = TRUE; } - if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, - info->ChipFamily == CHIP_FAMILY_HAWAII) || + if (!xf86ReturnOptValBool(info->Options, OPTION_ACCEL, + info->ChipFamily != CHIP_FAMILY_HAWAII) || (!RADEONIsAccelWorking(pScrn))) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "GPU accel disabled or not working, using shadowfb for KMS\n"); commit 851b2cf8714618843725f6d067915375485ade9d Author: Adam Jackson <a...@redhat.com> Date: Wed May 21 09:34:32 2014 -0400 kms: Use own thunk function instead of shadowUpdatePackedWeak I plan to delete the Weak functions from a future server. Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 5e052e4..ceaf575 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -212,6 +212,12 @@ radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode, return ((uint8_t *)info->front_bo->ptr + row * stride + offset); } +static void +radeonUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf) +{ + shadowUpdatePacked(pScreen, pBuf); +} + static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); @@ -232,7 +238,7 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) if (info->r600_shadow_fb) { pixmap = pScreen->GetScreenPixmap(pScreen); - if (!shadowAdd(pScreen, pixmap, shadowUpdatePackedWeak(), + if (!shadowAdd(pScreen, pixmap, radeonUpdatePacked, radeonShadowWindow, 0, NULL)) return FALSE; } commit b2dba2906f0b2284f17f53fd5251ba0f03d52a8b Author: Michel Dänzer <michel.daen...@amd.com> Date: Thu May 15 16:07:53 2014 +0900 Don't disable acceleration on >= SI on attempts to force EXA Also make this case clear in the log file: (WW) RADEON(0): EXA not supported, using glamor Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index 4aea51d..210ddcf 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -90,8 +90,13 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn) if (s == NULL && info->ChipFamily < CHIP_FAMILY_TAHITI) return FALSE; - if (s && strcasecmp(s, "glamor") != 0) - return FALSE; + if (s && strcasecmp(s, "glamor") != 0) { + if (info->ChipFamily >= CHIP_FAMILY_TAHITI) + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "EXA not supported, using glamor\n"); + else + return FALSE; + } if (info->ChipFamily < CHIP_FAMILY_R300) { xf86DrvMsg(scrn->scrnIndex, X_ERROR, commit be1469cc23aba46daf3293b3d09c5f2e792e7f42 Author: Alex Deucher <alexander.deuc...@amd.com> Date: Fri May 2 17:48:07 2014 -0400 radeon: enable tiling for mullins Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> diff --git a/src/radeon_kms.c b/src/radeon_kms.c index fb93f8a..5e052e4 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -889,13 +889,13 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags) * with proper bit, in the meantime you need to set tiling option in * xorg configuration files */ - info->ChipFamily <= CHIP_FAMILY_HAWAII && + info->ChipFamily <= CHIP_FAMILY_MULLINS && !info->is_fast_fb; /* 2D color tiling */ if (info->ChipFamily >= CHIP_FAMILY_R600) { info->allowColorTiling2D = xf86ReturnOptValBool(info->Options, OPTION_COLOR_TILING_2D, - info->ChipFamily <= CHIP_FAMILY_HAWAII); + info->ChipFamily <= CHIP_FAMILY_MULLINS); } if (info->ChipFamily >= CHIP_FAMILY_R600) { commit 2ae8e4b8d12f5c9bab6655eb8cd3c5c1d5cfb10e Author: Samuel Li <samuel...@amd.com> Date: Tue Nov 12 15:30:42 2013 -0500 radeon: add Mullins pci ids. Signed-off-by: Samuel Li <samuel...@amd.com> Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> Reviewed-by: Michel Dänzer <michel.daen...@amd.com> diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h index eb57992..94c8fc8 100644 --- a/src/ati_pciids_gen.h +++ b/src/ati_pciids_gen.h -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wwapo-0008gy...@moszumanska.debian.org