diff -Nru xserver-xorg-video-amdgpu-1.1.2/aclocal.m4 xserver-xorg-video-amdgpu-1.1.99+git20161010.d42773eb/aclocal.m4 --- xserver-xorg-video-amdgpu-1.1.2/aclocal.m4 2016-09-16 09:02:49.000000000 +0000 +++ xserver-xorg-video-amdgpu-1.1.99+git20161010.d42773eb/aclocal.m4 2016-10-10 06:28:32.000000000 +0000 @@ -9068,7 +9068,7 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) +dnl serial 11 (pkg-config-0.29.1) dnl dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson @@ -9110,7 +9110,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.1]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -9767,24 +9767,17 @@ fi]) # Test for the ability of xmlto to generate a text target -# -# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the -# following test for empty XML docbook files. -# For compatibility reasons use the following empty XML docbook file and if -# it fails try it again with a non-empty XML file. have_xmlto_text=no cat > conftest.xml << "EOF" + + + EOF AS_IF([test "$have_xmlto" = yes], [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], [have_xmlto_text=yes], - [# Try it again with a non-empty XML file. - cat > conftest.xml << "EOF" - -EOF - AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], - [have_xmlto_text=yes], - [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) rm -f conftest.xml AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) diff -Nru xserver-xorg-video-amdgpu-1.1.2/ChangeLog xserver-xorg-video-amdgpu-1.1.99+git20161010.d42773eb/ChangeLog --- xserver-xorg-video-amdgpu-1.1.2/ChangeLog 2016-10-10 06:31:18.000000000 +0000 +++ xserver-xorg-video-amdgpu-1.1.99+git20161010.d42773eb/ChangeLog 2016-10-10 06:28:35.000000000 +0000 @@ -1,12 +1,47 @@ -commit b407c1244d28a80f76275abca2239cdd4120f017 +commit 16888123fd1cd8042d45ec5dddb0ac44304bfdb2 +Author: Rico Tzschichholz +Date: Mon Oct 10 08:28:12 2016 +0200 + + Add debian tree from origin/debian-unstable + +commit d42773eb45baff5933730e26878a0b45fcf07b65 +Author: Michel Dänzer +Date: Wed Sep 28 18:17:53 2016 +0900 + + Rotate and reflect cursor hotspot position for drmModeSetCursor2 + + We were always passing the hotspot position in the X screen coordinate + space, but drmModeSetCursor2 needs it in the CRTC coordinate space. The + wrong hotspot position would cause the kernel driver to adjust the + HW cursor position incorrectly when the hotspot position changed. + + Reviewed-by: Alex Deucher + +commit bdee9f4dd4f21015e7696e06c4b485ab2b3a16dc Author: Michel Dänzer -Date: Fri Sep 16 18:11:31 2016 +0900 +Date: Wed Aug 31 16:46:56 2016 +0900 - Bump version for 1.1.2 release + Add support for ScreenPtr::SyncSharedPixmap + + This allows deferring shared pixmap updates between different drivers. + + (Ported from radeon commit 53be26b00e83f871f0afd39caa5a7a1d6ec4aea1) + Reviewed-by: Alex Deucher + +commit 97d7386caf7ba53d2cf398b8a9bb65d0a2a4770a +Author: Michel Dänzer +Date: Fri Sep 16 16:36:23 2016 +0900 + + Untangle HAS_XORG_CONF_DIR / --with-xorg-conf-dir lines in configure.ac + + $sysconfigdir used to be part of the default --with-xorg-conf-dir value, + but it no longer is. + + Reviewed-by: Alex Deucher -commit 82062157263d6f63ce8f645bf32101fd18bd98e5 +commit aa8a3fa2468094cd37959179e8417ba7ba0a326c Author: Michel Dänzer -Date: Fri Sep 16 18:01:41 2016 +0900 +Date: Fri Sep 16 15:59:16 2016 +0900 Fix handling of configure option --with-xorg-conf-dir @@ -28,17 +63,10 @@ Reported-by: Timo Aaltonen Reviewed-by: Julien Cristau - (Cherry picked from commit aa8a3fa2468094cd37959179e8417ba7ba0a326c) - -commit 6eb2b507d9ec8dcde2482a5ebf59c001933e10ea -Author: Michel Dänzer -Date: Wed Sep 14 18:26:50 2016 +0900 - - Bump version for the 1.1.1 release -commit 8761c46babe0ec01da784dd27db3dd9e769acbca +commit cd3acb75718dfd42dd25d58b4e7bd4db27b659d8 Author: Michel Dänzer -Date: Thu Sep 15 15:28:12 2016 +0900 +Date: Wed Sep 14 18:33:42 2016 +0900 Use --with-xorg-conf-dir=$prefix/share/X11/xorg.conf.d by default @@ -51,2371 +79,1311 @@ This matches what some (though not all) input drivers are doing for their xorg.conf.d snippets. - - (Cherry picked from commit cd3acb75718dfd42dd25d58b4e7bd4db27b659d8) -commit ca1cf24d4eb773f7380c0da3fa942a5c85074422 -Author: Marek Olšák -Date: Wed Sep 14 17:30:19 2016 +0900 +commit 0f8df8584ad61a3e47fe303b34cd7b0c4ed08bb0 +Author: Michel Dänzer +Date: Thu Sep 8 18:14:49 2016 +0900 - Fix cursor size for SI + Make TearFree effective with PRIME slave scanout - Reviewed-by: Michel Dänzer - Acked-by: Edward O'Callaghan - (Cherry picked from commit c4364520691d18961f0a6b77071baeeffaa80a11) - -commit ca84c49c88235e1909d11e192eada816b782f041 -Author: Ronie Salgado -Date: Wed Sep 14 17:30:30 2016 +0900 - - Add SI PCI IDs + TearFree can now prevent tearing with any possible display + configuration. - Reviewed-by: Michel Dänzer - (Cherry picked from commit 2eb5d77b841e55e7328df4b95c0d41fec30ce10f) + Note that there may still be inter-GPU tearing if the primary GPU uses + a different driver. + + (Ported from radeon commit 38797a33117222dadbc89e5f21ed8cd5deef9bea) + Reviewed-by: Alex Deucher -commit e80321016f7cab9d46f83b785d576d7f02e680ed +commit d6feed2cd78fe879aba4860a6d9bc2e388b9f135 Author: Michel Dänzer -Date: Wed Sep 14 17:20:28 2016 +0900 +Date: Thu Sep 8 17:56:24 2016 +0900 - Add missing Kaveri PCI ID (1318) + Synchronize scanout pixmaps for TearFree - Found by comparing src/pcidb/ati_pciids.csv with xf86-video-ati. + Copy the damaged areas which are still valid in the other scanout pixmap + from there, then only copy the remaining damaged area from the screen + pixmap. + + This is slightly more efficient (only needs one Damage record instead of + two, and only needs to copy each screen update across PCIe once with + ShadowPrimary and a discrete GPU), and will be significantly more + efficient for PRIME with the following change. + (Ported from radeon commit eda1f3df6aaed683036369fe8820da4dac3c2ae2) Reviewed-by: Alex Deucher - (Cherry picked from commit 7d050d15d49ef25e86e7abe88dafb52370715640) -commit 772e43d3e890b193ba24274bf629c8304f17cebc +commit 4927b84ec84bc0cb5055686cca6be54390f82803 Author: Michel Dänzer -Date: Wed Sep 14 17:19:58 2016 +0900 +Date: Thu Sep 8 17:52:25 2016 +0900 - Add Mullins PCI IDs + Move up amdgpu_scanout_extents_intersect - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97472 + Will be needed higher up by the following changes. No functional change. + + (Ported from radeon commit 2f6e5fb15f1a9ce523c85550e493f8bda9d0c00f) Reviewed-by: Alex Deucher - (Cherry picked from commit aa5492660958e359bdc2107cba9a211ff988c90e) -commit 3edf690d391b290066a3f39eb24695b8c8a0aaab -Author: Qiang Yu -Date: Wed Sep 14 17:19:29 2016 +0900 +commit 1c725f63961746258f6138b47037ec18bf508d78 +Author: Michel Dänzer +Date: Thu Sep 8 17:45:32 2016 +0900 - DRI2: Fix amdgpu_dri2_exchange_buffers width/height copy'n'paste error + Factor out transform_region helper - Signed-off-by: Qiang Yu + (Ported from radeon commit 5a57005178fc13b6f7e513458ca6dae72a3e5783) Reviewed-by: Alex Deucher - Reviewed-by: Michel Dänzer - (Cherry picked from commit 73c8dc000ad6b2b53ba3aa7155f5e8f6b55623b7) -commit 0b3bde7f9e42577b6720cb290d03fab3b05614b4 +commit c92842764f95fa09e145d81f80e9fa39ea8c453c Author: Michel Dänzer -Date: Wed Sep 14 17:18:51 2016 +0900 +Date: Thu Sep 8 17:26:18 2016 +0900 - DRI2: Add interpolated_vblanks in amdgpu_dri2_get_crtc_msc - - We need that in amdgpu_dri2_drawable_crtc as well for priv->vblank_delta - to work as intended. + Only copy from screen pixmap to shared pixmap on demand for slave scanout - amdgpu_dri2_get_msc was already doing this. + Only copy once for each time we update the corresponding scanout pixmap. + This can significantly reduce the bandwidth usage when there are + frequent updates to the screen pixmap. - Fixes hangs in some cases when using VDPAU via DRI2 and moving the - window between CRTCs. + This initial implementation only works when both the master and slave + screens use this driver. + (Ported from radeon commit 99232f64db52812a843cd616d263d3a6b90eef3d) Reviewed-by: Alex Deucher - (Cherry picked from commit abd1a7901c95e4bc78415cf1b7923623b9177152) -commit 2e6e81aa8d4b33eb326e674dca4e29b3d638cac0 +commit 61ceefe17fe9e6ffbaaad0e216b2bd37fd39f47d Author: Michel Dänzer -Date: Wed Sep 14 17:17:39 2016 +0900 +Date: Thu Sep 8 17:15:03 2016 +0900 - Only use RandR APIs if RandR is enabled + Track damage accurately for RandR 1.4 slave scanout - Fixes crash with Xinerama enabled, which disables RandR. - - Fixes: https://bugs.debian.org/827984 + This further reduces the PCIe bandwidth usage. - (Ported from radeon commit 3be841d0ae7d505cef325993205b12d15e98dba9) + (Ported from radeon commit b0867063abb197b9134166706d99fcbe5f204bb5, + plus leak fix from 5a57005178fc13b6f7e513458ca6dae72a3e5783) Reviewed-by: Alex Deucher - (Cherry picked from commit b5e2b964b7884c205a7c0fa578e05e867c176fcc) -commit 01565e4427b192c7c55a820f1fb762e852859903 +commit 6d31fb124d4418e64c949bde9ed1facf95967762 Author: Michel Dänzer -Date: Wed Sep 14 17:16:49 2016 +0900 +Date: Thu Sep 8 17:04:05 2016 +0900 - Destroy all dedicated scanout buffers during CloseScreen + Handle RandR 1.4 slave dirty updates via amdgpu_drm_queue - Fixes leaking active scanout buffers across a server reset, which also - fixes server reset with glamor and active scanout buffers. + This reduces PCIe bandwidth usage and tearing. + (Ported from radeon commit ad0a0656dd0e74683e6d7789decba827aa29c221) Reviewed-by: Alex Deucher - (Cherry picked from commit d96dabc71b1b32dc4b422a9633cdd4e0e95da052) -commit 7977f39d3c7847aeba2a06f4923f12eee27b4474 +commit b10ecdbd89b0a60a990c78c3e53bab6c4c96fe9f Author: Michel Dänzer -Date: Wed Sep 14 16:50:36 2016 +0900 +Date: Thu Sep 8 16:48:59 2016 +0900 - glamor: Reallocate linear pixmap BO if necessary for DRI2 PRIME + Use drmmode_crtc_scanout_* helpers for RandR 1.4 scanout pixmaps - Fixes corruption when using DRI2 PRIME render offloading with the master - screen using this driver. + This should allow using multiple CRTCs via RandR 1.4 even with xserver + < 1.17. It also simplifies the code a little, and paves the way for + following changes. - Reported-by: Qiang Yu + (Ported from radeon commits 4cfa4615f79f64062e5e771cd45dd7048f48b4f6 + and a92c27484703abc7c410b6ae0e4b8d1efbbb8e6f) Reviewed-by: Alex Deucher - Tested-by: Qiang Yu - (Cherry picked from commit 0007c2f018ba663303d91d847e7c085269a23062) -commit 062a7b9b81473969e5ca6034e5369106bf3088c4 +commit 9565981f751b0884cbfa885b8f3af3d41a965a2b Author: Michel Dänzer -Date: Wed Sep 14 16:49:53 2016 +0900 +Date: Wed Sep 7 18:49:54 2016 +0900 - Move DRI2's local fixup_glamor helper to amdgpu_glamor_set_pixmap_bo v2 + Wait for pending flips to complete before turning off an output or CRTC - So it can be used outside of the DRI2 code. + At least with older kernels, the flip may never complete otherwise, + which can result in us hanging in drmmode_set_mode_major. - v2: Keep pixmap refcnt increment in amdgpu_dri2_create_buffer2 (Qiang Yu) + Fixes: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-ati/+bug/1577170 + (Ported from radeon commits 9090309e057dc703d1a5bffd88e6cae14108cfc3, + e520ce0ec0adf91ddce5c932d4b3f9477fd49304, + a36fdaff40d5b4795a1400c348a80eee94892212 and + 4bd2d01552f18153afa03a8947b22eebf3d67c6b) Reviewed-by: Alex Deucher - Tested-by: Qiang Yu (v1) - (Cherry picked from commit 5518bf5d793439b5bab369e5fc18de9a4a3b9dd6) -commit 7dc2c5bae56a0c2aab38a9d8e77966b5d2f22ff2 +commit c7d27c94cb656899746898c2e55407c3e3d7cdc8 Author: Michel Dänzer -Date: Wed Sep 14 16:48:46 2016 +0900 +Date: Wed Sep 7 18:28:23 2016 +0900 - Consolidate get_drawable_pixmap helper + Keep track of damage event related flushes per-client - There were two static helpers for the same purpose. Consolidate them - into a single inline helper which can be used anywhere. + This further reduces the compositing slowdown due to flushing overhead, + by only flushing when the X server actually sends XDamageNotify events + to a client, and there hasn't been a flush yet in the meantime. + (Ported from radeon commit 121a6de72da5fcf9a32408eff36b2235f3dfbcfe) Reviewed-by: Alex Deucher - Tested-by: Qiang Yu - (Cherry picked from commit 641f4647b7f51dfd2da330376cd10fa9702b6423) -commit 5be3295cb2068d0b8234344f66ece245e4fa7999 +commit 58773d1945cfa8155d8a6c5eb3f95097535604ef Author: Michel Dänzer -Date: Wed Sep 14 16:43:48 2016 +0900 +Date: Wed Sep 7 18:14:10 2016 +0900 - Add amdgpu_pixmap_get_tiling_info + Use EventCallback to avoid flushing every time in the FlushCallback - Retrieves the tiling information about a pixmap BO from the kernel - driver. + We only need to flush for XDamageNotify events. + + Significantly reduces compositing slowdown due to flushing overhead, in + particular with glamor. + (Ported from radeon commit 9a1afbf61fbb2827c86bd86d295fa0848980d60b) Reviewed-by: Alex Deucher - Tested-by: Qiang Yu - (Cherry picked from commit 8e40f190e4704c2802bf0f073f17e742786d0f18) -commit 8cd5aa76c7d7fc48f42c31020306ea871e9edda2 +commit d166d04f6951f6a48d7d5ce5d31bba857fe0cb06 Author: Michel Dänzer -Date: Wed Sep 14 16:43:10 2016 +0900 +Date: Wed Sep 7 18:03:05 2016 +0900 - Remove amdgpu_share_pixmap_backing + Add explicit AMDGPU_DRM_QUEUE_ERROR define - Not used anymore. + Should make the amdgpu_drm_queue_alloc error handling clearer, and gets + rid of a compile warning about it returning NULL. + (Ported from radeon commit a37af701768b12d86868a831a79f1e02ee4968cf) Reviewed-by: Alex Deucher - Tested-by: Qiang Yu - (Cherry picked from commit e7eeb6ad1133b6023d34b4489959ae330a8e15dd) -commit 0af88ed18a22b7d038c735093236c54eadc3b118 +commit 6a1ba044c2b71081e6060d0c096917d6238f2145 Author: Michel Dänzer -Date: Wed Sep 14 16:42:39 2016 +0900 +Date: Mon Aug 29 16:43:59 2016 +0900 - glamor: Fix amdgpu_glamor_share_pixmap_backing for priv->bo == NULL - - Fixes crash when running a compositor and DRI_PRIME client via DRI2. + Only list each unique chipset family once in the log file - Reported-by: Qiang Yu + Acked-by: Christian König Reviewed-by: Alex Deucher - Tested-by: Qiang Yu - (Cherry picked from commit b36c77695ba77b59a0ccd868454e3af4fc04d5ff) -commit 0d5b6957aef95872dd34ba0eb4284ebe70ee685d -Author: Alex Deucher -Date: Wed Sep 14 16:41:46 2016 +0900 +commit 7d050d15d49ef25e86e7abe88dafb52370715640 +Author: Michel Dänzer +Date: Mon Aug 29 16:13:20 2016 +0900 - add missing bonaire pci id + Add missing Kaveri PCI ID (1318) - Signed-off-by: Alex Deucher - (Cherry picked from commit 60ced5026ebc34d9f32c7618430b6a7ef7c8eb4b) + Found by comparing src/pcidb/ati_pciids.csv with xf86-video-ati. + + Reviewed-by: Alex Deucher -commit 10ff4b42eaa946364b19e9433bc85748e1db2835 -Author: Flora Cui -Date: Wed Sep 14 16:41:16 2016 +0900 +commit aa5492660958e359bdc2107cba9a211ff988c90e +Author: Michel Dänzer +Date: Mon Aug 29 15:52:48 2016 +0900 - Add more Polaris 11 PCI IDs + Add Mullins PCI IDs - Signed-off-by: Flora Cui - Reviewed-by: Christian König - Signed-off-by: Alex Deucher - (Cherry picked from commit 8e89448ee00da16e05e6777f34bb75d2dd6f7025) + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97472 + Reviewed-by: Alex Deucher -commit af5d3932147390ee2dcf33f594f549dc562e5078 -Author: Flora Cui -Date: Wed Sep 14 16:40:43 2016 +0900 +commit 73c8dc000ad6b2b53ba3aa7155f5e8f6b55623b7 +Author: Qiang Yu +Date: Mon Aug 22 19:13:26 2016 +0800 - Add more Polaris 10 PCI IDs + DRI2: Fix amdgpu_dri2_exchange_buffers width/height copy'n'paste error - Signed-off-by: Flora Cui + Signed-off-by: Qiang Yu Reviewed-by: Alex Deucher Reviewed-by: Michel Dänzer - Signed-off-by: Alex Deucher - (Cherry picked from commit a59b23d64285741a7a25e314343f6261046d980f) -commit da820a6661357ae707e5793a549476c085d90236 -Author: Qiang Yu -Date: Wed Sep 14 17:18:23 2016 +0900 +commit 5a4d3267ac3823fe58b51b0b9075b82375d7180c +Author: Michel Dänzer +Date: Wed Aug 17 18:57:01 2016 +0900 - Fix amdgpu_mode_hotplug crash on multi GPU platform. + Remove unused lut_r/g/b arrays from drmmode_crtc_private_rec - On multi GPU platform, some screen is created by other GPU DDX. + Fixes: 1091f28e1fa2 ("Remove drmmode_load_palette") + Reviewed-by: Alex Deucher + +commit c4364520691d18961f0a6b77071baeeffaa80a11 +Author: Marek Olšák +Date: Fri Aug 19 12:42:38 2016 +0200 + + Fix cursor size for SI + + Reviewed-by: Michel Dänzer + Acked-by: Edward O'Callaghan + +commit 2eb5d77b841e55e7328df4b95c0d41fec30ce10f +Author: Ronie Salgado +Date: Thu Feb 11 03:00:14 2016 -0300 + + Add SI PCI IDs - Signed-off-by: Qiang Yu Reviewed-by: Michel Dänzer - (Cherry picked from commit 978242977e5dc905e1d5a46b1b0d34b356c7af26) -commit f8c6e51211d2fe2d01fa2223b4215f293e6a11f5 +commit abd1a7901c95e4bc78415cf1b7923623b9177152 Author: Michel Dänzer -Date: Wed Sep 14 16:39:55 2016 +0900 +Date: Wed Jun 29 17:54:26 2016 +0900 - Handle Zaphod mode correctly in amdgpu_mode_hotplug + DRI2: Add interpolated_vblanks in amdgpu_dri2_get_crtc_msc - We need to scan both screens of the entity for existing connectors, and - enumerate DVI & HDMI connectors consistently regardless of which screen - they're assigned to. + We need that in amdgpu_dri2_drawable_crtc as well for priv->vblank_delta + to work as intended. - Fixes crash when hot-(un)plugging connectors in Zaphod mode. + amdgpu_dri2_get_msc was already doing this. - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93415 - (Ported from radeon commit c801f9f10a5d72d935faf21e72f7e7808fb4f05f) + Fixes hangs in some cases when using VDPAU via DRI2 and moving the + window between CRTCs. Reviewed-by: Alex Deucher - (Cherry picked from commit 14606e127f4b6eb0b00fd42cec13d524a67e4c4a) - -commit 988b6de86658b845af50542cfd71a0c9c267991d -Author: Flora Cui -Date: Wed Sep 14 16:38:56 2016 +0900 - - add strato pci id - - Signed-off-by: Flora Cui - Reviewed-by: Jammy Zhou - (Cherry picked from commit 4822ec7a23d2253c88bc403f17abb6d7a053528c) -commit 804dd4be71733f5f5078e5b4824abe9a9bb1228d +commit 978242977e5dc905e1d5a46b1b0d34b356c7af26 Author: Qiang Yu -Date: Wed Sep 14 16:01:16 2016 +0900 +Date: Wed Jul 13 19:25:12 2016 +0800 - Remove RR_Capability_SinkOutput for GPU without CRTC. + Fix amdgpu_mode_hotplug crash on multi GPU platform. + + On multi GPU platform, some screen is created by other GPU DDX. Signed-off-by: Qiang Yu - Reviewed-by: Alex Deucher Reviewed-by: Michel Dänzer - (Cherry picked from commit a0bbb373f902e0ffc14570c85faec7e44134f62e) -commit a04f4015d6afef20c2b79e2779f6555836ee2b07 -Author: Michel Dänzer -Date: Thu Apr 7 16:47:25 2016 +0900 +commit fdd1209e26128b3e894f2867fac3a1b08fe1f29e +Author: Keith Packard +Date: Tue Jul 19 09:16:32 2016 -0700 - Bump version for 1.1.0 release + Use NotifyFd for drm fd + + NotifyFd is available after API 22, and must be used after API 23. + + Signed-off-by: Keith Packard -commit aed1c17c43b2c0c983f6fc0973a5224d0faf32d9 +commit 17c0cf49746a20fb25610c24a40c441f88c08365 +Author: Adam Jackson +Date: Tue Jul 19 10:03:56 2016 -0400 + + Adapt Block/WakeupHandler signature for ABI 23 + + Signed-off-by: Adam Jackson + +commit b5e2b964b7884c205a7c0fa578e05e867c176fcc Author: Michel Dänzer -Date: Mon Apr 4 18:28:02 2016 +0900 +Date: Wed Jul 6 17:46:56 2016 +0900 - glamor: Force GPU rendering to/from pixmaps created via DRI3 + Only use RandR APIs if RandR is enabled - Fixes crash when running DRI3 clients with ShadowPrimary enabled. + Fixes crash with Xinerama enabled, which disables RandR. - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94799 + Fixes: https://bugs.debian.org/827984 + (Ported from radeon commit 3be841d0ae7d505cef325993205b12d15e98dba9) Reviewed-by: Alex Deucher -commit faf9d720b7d650f5f1ea657a874d08eac3972e60 +commit 84496ebc89a9973347c774c13ff6f4667fcdbe69 Author: Michel Dänzer -Date: Fri Apr 1 16:09:51 2016 +0900 +Date: Wed Jul 6 17:43:36 2016 +0900 - Update manpage entry for Option "TearFree" + Add .editorconfig file - It's now effective for rotation as well. + Basically a conversion from .dir-locals.el. EditorConfig supports many + more editors and IDEs. + (Ported from radeon commit aa07b365d7b0610411e118f105e49daff5f5a5cf) Reviewed-by: Alex Deucher -commit 5ba95c3abeb8df82aa8d33a47596eae6403ea7af +commit a576430526cbc404de64b30e1377a356644e8024 Author: Michel Dänzer -Date: Fri Apr 1 15:29:26 2016 +0900 +Date: Fri Jun 24 16:28:25 2016 +0900 - Identify DRM event queue entries by sequence number instead of by pointer - - If the memory for an entry was allocated at the same address as that for - a previously cancelled entry, the handler could theoretically be called - prematurely, triggered by the DRM event which was submitted for the - cancelled entry. + Clear damage in amdgpu_scanout_update if it doesn't intersect the CRTC - (Ported from radeon commit 4693b1bd5b5c381e8b7b68a6f7f0c6696d6a68df) + There's no need to test that same damage again. Reviewed-by: Alex Deucher -commit 8ecfa69b5a833bd4c39e773a6acfd7eef9144d13 +commit ede7f2bcae63be65e05e3029bfe7c742e5978932 Author: Michel Dänzer -Date: Wed Mar 30 18:33:00 2016 +0900 +Date: Fri Jun 24 16:19:15 2016 +0900 - DRI3: Refuse to open DRM file descriptor for ssh clients - - Fixes hangs when attempting to use DRI3 on display connections forwarded - via SSH. - - Don't do this for Xorg > 1.18.99.1 since the corresponding xserver - change has landed in Git master. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93261 + Remove w/h parameters from amdgpu_scanout_extents_intersect - (Ported from radeon commit 0b3aac1de9db42bfca545fa331e4985836682ec7) + We can use the dimensions of the CRTC's mode instead. Reviewed-by: Alex Deucher -commit b2a2e114eec0967f7b67f030fbab8983cf980489 +commit bf000ea7ef91f5ecb59fc3c1ab8ed9eddcc0841d Author: Michel Dänzer -Date: Fri Mar 25 11:55:34 2016 +0900 +Date: Thu Jun 23 17:28:16 2016 +0900 - Revert "Use render node for DRI3 if available" - - This reverts commit ea558e645786b08d75307716036045170e97b43e. + Make the dedicated scanout mechanism work with arbitrary transforms v2 - It broke VDPAU<->GL interop with DRI3 enabled, because the Gallium VDPAU - code doesn't support DRI3 yet. We can consider re-enabling this once - there is a Mesa release where the Gallium VDPAU code supports DRI3. + This makes TearFree work with arbitrary transforms, and makes transforms + work better even without TearFree, with xserver >= 1.12. - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94675 + v2: Preserve clamping of transformed damage extents to CRTC boundaries. Reviewed-by: Alex Deucher -commit e31a2d668a1b5ebaf75d423c8123cbc8e0dcbae9 -Author: Flora Cui -Date: Wed Nov 18 16:44:13 2015 +0800 +commit d96dabc71b1b32dc4b422a9633cdd4e0e95da052 +Author: Michel Dänzer +Date: Thu Jun 23 16:27:45 2016 +0900 - add polaris10 pci id + Destroy all dedicated scanout buffers during CloseScreen - Reviewed-by: Michel Dänzer - Signed-off-by: Flora Cui - Reviewed-by: Jammy Zhou + Fixes leaking active scanout buffers across a server reset, which also + fixes server reset with glamor and active scanout buffers. + + Reviewed-by: Alex Deucher -commit 6e09b8deb77f76b9bb7d393cc1ad924ebba62eff -Author: Flora Cui -Date: Thu Nov 5 14:16:39 2015 +0800 +commit 1091f28e1fa239ee1a973d84a8376fa4a95d7247 +Author: Michel Dänzer +Date: Thu Jun 23 12:47:04 2016 +0900 - add polaris11 pci id + Remove drmmode_load_palette + + Not used by any supported version of xserver. - Reviewed-by: Michel Dänzer - Signed-off-by: Flora Cui - Reviewed-By: Jammy Zhou Reviewed-by: Alex Deucher -commit 7d32c43fff4c8df32cce150223094f793e036cf3 -Author: Alex Deucher -Date: Wed Oct 28 17:28:23 2015 -0400 +commit 4d506c23c9a628204fa23607931557b07ada3e31 +Author: Michel Dänzer +Date: Wed Jun 22 17:16:24 2016 +0900 - add Polaris chip families + present: Separate checks for flips vs unflips v2 - Reviewed-by: Michel Dänzer - Signed-off-by: Alex Deucher + All unflip checks apply to flips as well, but not vice versa. + + v2: Add comment above amdgpu_present_check_unflip (Alex) + Reviewed-by: Alex Deucher -commit fbf9ae18cd241b8b78936aa30441e5fbfd9ba1c5 +commit decabd574f90d3df397c80ec931b3fde8a4afb49 Author: Michel Dänzer -Date: Thu Mar 24 19:05:15 2016 +0900 +Date: Wed Jun 22 17:43:41 2016 +0900 - Require xserver 1.9 or newer + dri2: Don't allow flipping when using a dedicated scanout buffer - 1.9.0 was released in August 2010. + Fixes issues when mixing rotation and page flipping with current xserver + Git master. - We were already unintentionally relying on things not available in 1.8 - for at least a year, and nobody has complained. + Reviewed-by: Alex Deucher + +commit 3ed28ce7cd26f89969617ba901ff253091d0d469 +Author: Michel Dänzer +Date: Wed Jun 22 16:54:01 2016 +0900 + + present: Don't allow flipping when using a dedicated scanout buffer - (Ported from radeon commit e592f32f8b5f5873fcc18b10a69dd5e4ccf11073) + Fixes issues when mixing rotation and page flipping with current xserver + Git master. Reviewed-by: Alex Deucher -commit 912db5fbbc6b9b1121c8a03168cb4bd870474376 +commit 9c3324715fd395fd486ea341654d78f4f298b97f Author: Michel Dänzer -Date: Thu Mar 24 18:59:05 2016 +0900 +Date: Wed Jun 22 16:12:32 2016 +0900 - Fix build against older versions of xserver - - Also slightly clean up the error handling in amdgpu_scanout_do_update. + Make sure drmmode_crtc->scanout[] are destroyed when not needed - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94614 + We failed to do this when going back to scanning out directly from the + screen pixmap. - (Ported from radeon commit bde466e5d44cad64b4e4eceaa5de80fdbf86356e) + As a bonus, since we now destroy drmmode_crtc->scanout[] after setting + the new scanout buffer, we may avoid the CRTC turning off intermittently + in this case. Reviewed-by: Alex Deucher -commit 3fb6280ab3b104b02841c7cab8ed68c1d463c834 +commit 3bce0519a4008cf87c0e31a7a579e10f5dcdd2f3 Author: Michel Dänzer -Date: Thu Mar 24 18:56:44 2016 +0900 +Date: Wed Jun 22 16:19:07 2016 +0900 - DRI3 only works with acceleration - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94214 - - (Ported from radeon commit d21ac4669a8b2cdd4eec5e5a94d1950b7423b8b5) - - Reviewed-by: Alex Deucher - -commit 3177fe817a5f2de4ed10860866a0dd6d6c6ba816 -Author: Michel Dänzer -Date: Thu Mar 24 18:51:59 2016 +0900 - - Check for xf86CursorResetCursor - - If it's available, Xorg calls it on each mode configuration change. It - does what xf86_reload_cursors does (and more), so we don't need to call - the latter anymore. - - (Ported from radeon commit d670c5c9851b4eff21c845d26c7d7e4eb5ee0fa9) - - Reviewed-by: Alex Deucher - -commit a3dfce7b24e1ea01c1aa62926025a545312cbe13 -Author: Michel Dänzer -Date: Thu Mar 24 18:45:46 2016 +0900 - - Don't try DRI2/Present flipping while the HW cursor can't be used - - Flipping doesn't interact correctly with SW cursor: A flip makes the SW - cursor disappear. It will only appear again when the cursor is moved, - but it will be surrounded by corruption, because the SW cursor code - will restore stale screen contents at the old cursor location before - drawing the cursor at the new location. - - (Ported from radeon commit 7f3d0780ca65a90117c2a61362dbc0899bd9c0b0) - - Reviewed-by: Alex Deucher - -commit ba9be8f32f0321689133e17c1681809dec8c6cf1 -Author: Michel Dänzer -Date: Thu Mar 24 18:44:30 2016 +0900 - - Factor out HW cursor checking code into drmmode_can_use_hw_cursor - - And add a check for RandR 1.4 multihead. - - (Ported from radeon commit 3de480e83c0a1824838d662d6d67c9fe85277298) - - Reviewed-by: Alex Deucher - -commit 4a60b4b1851a3cbc2d8ad9048d68eeb6947cf132 -Author: Michel Dänzer -Date: Thu Mar 24 12:03:38 2016 +0900 - - Call AMDGPUBlockHandler_KMS before setting initial modes - - Doing it the other way around meant that there was still a possibility - for the front buffer contents to be uninitialized when they start being - scanned out. - - Reviewed-by: Alex Deucher - -commit 37bd79652a8ec612b94a1863e8c580b1cfaf3960 -Author: Michel Dänzer -Date: Fri Mar 18 18:51:00 2016 +0900 - - present: Return rotated CRTCs from amdgpu_present_get_crtc - - Sync-to-vblank works fine with rotation. We're still checking for - rotation in amdgpu_present_check_flip. - - Returning NULL from here resulted in the xserver present code falling - back to the fake CRTC running at 1 fps. - - (Ported from radeon commit a03271de5ecdaa7790d1316e993c4450b91fe936) - - Reviewed-by: Alex Deucher - -commit 6b930fb3285dea4a6440e31099c96f08da508d49 -Author: Michel Dänzer -Date: Fri Mar 18 18:47:10 2016 +0900 - - present: Clear drmmode->fb_id before calling set_mode_major for unflip - - Without this, drmmode_set_mode_major may just re-set the FB for the - last flipped BO, in which case the display will probably freeze. - - Reproduction recipe: Enable rotation while a fullscreen client is - flipping. - - (Ported from radeon commit 40191d82370eb7e58bd34c44966cbf44c3703229) - - Reviewed-by: Alex Deucher - -commit 6889e091442b6ba1b9351e72bd067425e87d96e9 -Author: Michel Dänzer -Date: Fri Mar 18 18:18:04 2016 +0900 - - Make Option "TearFree" effective for rotated/reflected outputs as well - - Support varies by xserver version: - - < 1.12: No support for the driver handling rotation/reflection - 1.12-1.15: Support for driver handling rotation/reflection, but there's - a bug preventing the HW cursor from being visible everywhere - it should be on rotated outputs, so we can only support - TearFree for reflection. - >= 1.16: While the bug above is still there (fixes pending review), - the driver can force SW cursor for rotated outputs, so we - can support TearFree for rotation as well. - - (Ported from radeon commit 798c4fd16d339b1ad5fd729cc884be084c60e38b) - - Reviewed-by: Alex Deucher - -commit da4e0c66fcbcf63143372720e3d606a462332e3a -Author: Michel Dänzer -Date: Fri Mar 18 18:15:34 2016 +0900 - - Consolidate pScreen usage in drmmode_set_mode_major - - We were already relying on pScrn->pScreen being non-NULL in some cases, - which is supposedly always true ever since this function is no longer - getting called from ScreenInit. - - (Ported from radeon commit eb611a2e4ecce7a1ab85fd72b9b78e3269311dd5) - - Reviewed-by: Alex Deucher - -commit 0bbf09dd7ef54133b3e534becb3ba15c0cf3eed2 -Author: Michel Dänzer -Date: Fri Mar 18 18:14:28 2016 +0900 - - Remove check for XF86_CRTC_VERSION 3 - - We require xserver >= 1.8, which was already at version 3. - - (Ported from radeon commit 06602171386e538081c298645fb7ca1a70fe80cc) - - Reviewed-by: Alex Deucher - -commit 3485ca0051a224d00135d4024a97a6c4e85a9644 -Author: Michel Dänzer -Date: Fri Mar 18 18:07:07 2016 +0900 - - Deal with modesets and page flips crossing on a CRTC - - If we set a mode while a flip is pending, the kernel driver may program - the flip to the hardware after the modeset. If that happens, the hardware - will display the BO from the flip, whereas we will assume it displays the - BO from the modeset. In other words, the display will most likely freeze, - at least until another modeset. - - Prevent this condition by waiting for a pending flip to finish before - setting a mode. - - Fixes display freezing when setting rotation or a transform with - TearFree enabled. - - (Ported from radeon commit a88985f5d1e39caca49ceb65678aaa9cb622a0d2) - - Reviewed-by: Alex Deucher - -commit b9d00fa7aaf946d985897380bfa42faafbf1b3fb -Author: Michel Dänzer -Date: Fri Mar 18 17:18:00 2016 +0900 - - Make DRM event queue xf86CrtcPtr based instead of ScrnInfoPtr based - - This allows for a minor simplification of the code. - - (Ported from radeon commit f5d968cbba3c9b7ec202161f2157d8d64778c817) - - Reviewed-by: Alex Deucher - -commit e0ed26151bfeadf309da53d001751c0a014dbd24 -Author: Michel Dänzer -Date: Fri Mar 18 17:11:47 2016 +0900 - - Remove amdgpu_scanout_flip_handler - - No longer necessary now that amdgpu_drm_queue_handler can handle - e->handler == NULL. - - (Ported from radeon commit d5dbb07db22d5420c81dfebc060f0dd86e7b8a20) - - Reviewed-by: Alex Deucher - -commit acd5da56f502d6ad115501e77bce06fe72b1895c -Author: Michel Dänzer -Date: Fri Mar 18 17:14:49 2016 +0900 - - DRI2: Also clear dri2_flipping when client disconnects before event - - Fixes the following problem: - - With DRI3 enabled, run glxgears with LIBGL_DRI3_DISABLE=1, make it - fullscreen and press Escape while it's still fullscreen. This could - result in dri2_flipping not getting cleared, spuriously preventing apps - using DRI3 from flipping. - - (Ported from radeon commit e87365117acbd80b7d80fbb5eb30890ef7153291) - - Reviewed-by: Alex Deucher - -commit a58bfa98208cc092014d3f36a08714eb1e0d8814 -Author: Michel Dänzer -Date: Fri Mar 18 17:07:47 2016 +0900 - - drm_queue: Don't abort events immediately from amdgpu_drm_abort_client - - Keep them around until the DRM event arrives, but then call the abort - functions instead of the handler functions. - - This is a prerequisite for the following fix. - - (Ported from radeon commit 3989766edde85d1abe7024577b98fc9b007bc02a) - - Reviewed-by: Alex Deucher - -commit e4888df6e32bb817bf0d6166a22b19c14e189a84 -Author: Michel Dänzer -Date: Fri Mar 18 17:04:10 2016 +0900 - - Fix RandR CRTC transforms - - Currently, Xorg will only transform the cursor as of the first time the - cursor image changes after a transform is set. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80678 - - (Ported from radeon commit 9483a3d777919b224f70c3b4d01e4b320a57db31) - - Reviewed-by: Alex Deucher - -commit 43af92ede0968f2108f9562aa4c2c861ac703617 -Author: Michel Dänzer -Date: Fri Mar 18 16:58:07 2016 +0900 - - Build RandR 1.4 provider name from chipset name and bus ID - - Instead of just "amdgpu", it's now e.g. "TONGA @ pci:0000:01:00.0". - - (Ported from radeon commit c7cf00487cd6d4a5d0f39d5b92ff04f6420d6a32) - - Reviewed-by: Alex Deucher - -commit 5ec1797a2858d693d18d21326e2307d71555e1db -Author: Michel Dänzer -Date: Wed Feb 24 17:33:49 2016 +0900 - - DRI2: Use amdgpu_pixmap_get_handle - - Now we can share pixmaps with no struct amdgpu_buffer via DRI2. - - Fixes VDPAU video playback freezing when using an OpenGL compositor with - DRI3 enabled and mpv VAAPI hardware decoding with OpenGL output. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89755 - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93804 - - (ported from radeon commit f8b0f23e9f4af9f9097ee5e72d53b45173163c41) - - Reviewed-by: Alex Deucher - -commit df60c635e1e632233de9dd4b01d63c2b963003f8 -Author: Michel Dänzer -Date: Wed Feb 24 17:06:43 2016 +0900 - - glamor: Avoid generating GEM flink names for BOs shared via DRI3 (v2) - - We can't create our own struct amdgpu_buffer representation in this case - because destroying that would make the GEM handle inaccessible to glamor - as well. So just get the handle directly via dma-buf. - - (ported from radeon commit 391900a670addec39515f924265bfa9f8bfa9ec0, - extended to cache BO handles in the private for non-DRI3 pixmaps as - well) - - v2: Swap whole pixmap privates instead of just BOs in - amdgpu_dri2_exchange_buffers to avoid invalidating cached BO handles - - Reviewed-by: Alex Deucher - -commit e463b849f3e9d7b69e64a65619a22e00e78d297b -Author: Michel Dänzer -Date: Tue Feb 23 18:10:29 2016 +0900 - - Make amdgpu_do_pageflip take a pixmap instead of a BO - - (inspired by radeon commit 7b4fc4a677d252d01c2bf80d162bc35814059eaa) - - Reviewed-by: Alex Deucher - -commit 1ee341f9d909f3b7ba2984fc912dabdb98c34b19 -Author: Michel Dänzer -Date: Tue Feb 23 18:42:19 2016 +0900 - - Add amdgpu_pixmap_get_handle helper - - (inspired by radeon commits dfad91fffb5bd013785223b42d78886df839eacf - and ccbda955ebae1d457d35293833f12791e0f9fb0b) - - Reviewed-by: Alex Deucher - -commit a36bbfd98b96426bbe0be3923c64da7ec0e565d0 -Author: Michel Dänzer -Date: Mon Feb 15 18:41:51 2016 +0900 - - HAS_DIRTYTRACKING_ROTATION also supports multiple CRTCs - - (ported from radeon commit ff9a6b6f079a8419f4e6fadfee778060618bf735) - - Reviewed-by: Alex Deucher - -commit a37746ffceaed83e48e48fb05439be7e020dd2ea -Author: Michel Dänzer -Date: Mon Feb 15 18:35:54 2016 +0900 - - Load fb module before glamoregl/shadow modules - - Fixes unresolved symbols on some systems. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93105 - (ported from radeon commit 78fbca095ae9887a2d3de48bb07975e2d1126e68) - - Reviewed-by: Alex Deucher - -commit 59c0a6807110eca829c6708e16585a38f39a5c17 -Author: Michel Dänzer -Date: Mon Feb 15 18:28:13 2016 +0900 - - Don't advertise any PRIME offloading capabilities without acceleration - - Acceleration is required even for display offloading. Trying to enable - display offloading without acceleration resulted in a crash. - - (ported from radeon commit b19417e2fddf4df725951aea5ad5e9558338f59e) - Reviewed-by: Alex Deucher - -commit a3eac85d812ecc605436e6bd5b9ee7ebf307e3d3 -Author: Michel Dänzer -Date: Tue Jan 26 16:12:28 2016 +0900 - - Only map front buffer if glamor acceleration is disabled (v2) - - Otherwise the front buffer may not be accessible by the CPU, because Mesa - sets the AMDGPU_GEM_CREATE_NO_CPU_ACCESS flag for tiled buffers, because - accessing tiled buffers with the CPU makes little sense. - - v2: Also handle Option "AccelMethod" "none" - - Reviewed-by: Alex Deucher - -commit 2fcb7dadd3c71cd405cbbaafc777697538ca9c29 -Author: jimqu -Date: Mon Jan 25 09:47:00 2016 +0800 - - glamor: Return NullPixmap on failure to create shareable pixmap - - If we were asked to create a shareable pixmap, it doesn't make sense - to return a pixmap which isn't shareable. Doing so caused trouble down - the line such as a crash with older versions of glamor when trying to - use GLX pixmaps of bpp < 32 via DRI2. - - Signed-off-by: JimQu - Reviewed-by: Michel Dänzer - -commit 5269a2228bff6023c1a7f3e8534027e1d7addc25 -Author: jimqu -Date: Mon Jan 25 10:12:02 2016 +0800 - - Move amdgpu_glamor_destroy_pixmap before amdgpu_glamor_create_pixmap - - The next commit will call the former from the latter. No functional - change. - - Signed-off-by: JimQu - Reviewed-by: Michel Dänzer - -commit 54c959c163288caa87f612911b70df73f87d29d6 -Author: Tom St Denis -Date: Wed Jan 20 09:37:36 2016 -0500 - - Move memset() after variable declarations - - To make the code more "C" like move the function calls - after the variable declarations. - - Signed-off-by: Tom St Denis - Reviewed-by: Alex Deucher - Reviewed-by: Michel Dänzer - -commit 8853b07ae8169c409740c40d45cd335bd608f2a7 -Author: Michel Dänzer -Date: Tue Jan 19 17:35:11 2016 +0900 - - Set the RandR primary output on startup if Xorg hasn't - - Fixes xrandr (XRRGetOutputPrimary) not reporting any output as primary - after startup. - - (Ported from radeon commit b16856b25086ffb27365ac2249b8da921066ce62) - - Reviewed-by: Alex Deucher - -commit bd5c65daceaf633c36fcec86ff061df10c364bc0 -Author: Michel Dänzer -Date: Thu Jan 7 15:53:41 2016 +0900 - - Only call amdgpu_bus_id once in each probe path (v2) - - Instead of up to twice as before. - - v2: Remove free(busIdString) call from amdgpu_kernel_mode_enabled, the - bus ID string is now managed by its callers. - - Reviewed-by: Alex Deucher (v1) - -commit 6e42c58375a4c3229da93c27bbd104af145c6163 -Author: Michel Dänzer -Date: Thu Jan 7 15:57:38 2016 +0900 - - Remove pci_dev test from amdgpu_get_scrninfo - - The pci_dev parameter can never be NULL since we only support KMS. - - Reported-by: Tom St Denis - Reviewed-by: Alex Deucher - -commit 8e09180798a06af5afa030d754938e4ca06e272f -Author: Michel Dänzer -Date: Thu Jan 7 15:35:35 2016 +0900 - - Re-use PCI bus ID code from kernel_open_fd in kernel_mode_enabled - - Reviewed-by: Alex Deucher - -commit 4eb9cedca080b30c57ded349a397620ee7d0cd46 -Author: Mykola Lysenko -Date: Wed Jan 13 14:03:55 2016 +0800 - - Initialize drmmode_crtc dpms_mode to DPMSModeOff - - This disables query of disabled pipes for drmWaitVBlank on X start - - Signed-off-by: Mykola Lysenko - Reviewed-by: Michel Dänzer - -commit 1d0b0c1794e65e581a48aa9fb19679d928d82a5d -Author: Michel Dänzer -Date: Thu Dec 10 18:08:12 2015 +0900 - - sync: Check if miSyncShmScreenInit symbol is resolved at runtime - - It may be disabled in the Xorg build, either explicitly or because the - xshmfence library isn't available. - - Reviewed-by: Alex Deucher - -commit f4107f67f147e2500582fc36cf0f0f76bc1ef098 -Author: Mykola Lysenko -Date: Wed Dec 23 11:58:47 2015 -0500 - - Check for NULL koutput in drmmode_output_dpms - - This situation happens whit start of usage of DRM DP MST framework, - when connectors created and destroyed dynamically. - - Signed-off-by: Mykola Lysenko - Reviewed-by: Michel Dänzer - -commit ea558e645786b08d75307716036045170e97b43e -Author: Jammy Zhou -Date: Fri Nov 20 17:03:05 2015 +0800 - - Use render node for DRI3 if available - - Signed-off-by: Jammy Zhou - Reviewed-by: Michel Dänzer - -commit 43c2dc1aab682d5b6ad49d24983d6382c4f305bb -Author: Michel Dänzer -Date: Thu Nov 19 17:05:05 2015 +0900 - - glamor: Deal with glamor_egl_destroy_textured_pixmap being removed - - When it's not available, it's safe to call down to the glamor - DestroyPixmap hook instead. - - (ported from radeon commit 10b7c3def58bb34acc38f076bc230e25b454ab79) - - Reviewed-by: Alex Deucher - -commit 84cab5738a315e9825bd0864c4f0fc5b03eb81a1 -Author: Michel Dänzer -Date: Thu Nov 19 16:44:22 2015 +0900 - - glamor: Restore all ScreenRec hooks during CloseScreen - - (ported from radeon commit 535e5438b2c32f774b9c8c27ee0289b4749548ef) - - Reviewed-by: Alex Deucher - -commit a00c050c2e5667ed815c51979a3cadb5146136ff -Author: Michel Dänzer -Date: Thu Nov 19 17:55:53 2015 +0900 - - Post 1.0.0 release version bump - -commit 755e6ff2337cf615e3ba0854ccd533baec7144db -Author: Michel Dänzer -Date: Thu Nov 19 17:28:19 2015 +0900 - - Bump version for 1.0.0 release - -commit 49c7d2be99aaf6d040e553065bdc461ce8d4769a -Author: Michel Dänzer -Date: Thu Nov 19 17:14:54 2015 +0900 - - Add amdgpu_pixmap.h to src/Makefile.am's EXTRA_DIST - - Fixes make distcheck. - -commit d069ec5d27f5c8d2ab17b759b85293ef4113acf3 -Author: Stephen Chandler Paul -Date: Wed Nov 11 18:10:55 2015 +0900 - - Handle failures in setting a CRTC to a DRM mode properly - - This fixes a bug where running the card out of PPLL's when hotplugging - another monitor would result in all of the displays going blank and - failing to work properly until X was restarted or the user switched to - another VT. - - [Michel Dänzer: Pass errno instead of -ret to strerror()] - - Signed-off-by: Stephen Chandler Paul - (ported from radeon commit 7186a8713ba004de4991f21c1a9fc4abc62aeff4) - - Reviewed-by: Alex Deucher - -commit c8bddcf6c97b1338be3715f1fc5e0b17ce71c195 -Author: Michel Dänzer -Date: Wed Nov 11 18:09:59 2015 +0900 - - Call xf86CrtcRotate from initial drmmode_set_desired_modes call - - Fixes various problems when rotation is specified in xorg.conf. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92475 - - (ported from radeon commit 548e97b3b7d1e94075a54ca2bb4eb683025098a7) - - Reviewed-by: Alex Deucher - -commit 12815156f38ce3357f03901a78402db834577d11 -Author: Emil Velikov -Date: Wed Nov 11 18:04:01 2015 +0900 - - Do not link amdgpu_drv.so against libpciaccess - - Not used directly. - - Signed-off-by: Emil Velikov - (ported from radeon commit fcb32231a38f9461d12720cbf72f63502197a711) - - Reviewed-by: Alex Deucher - -commit a02982b0ae0b79d2f183a1628edc05cafed8703a -Author: Michel Dänzer -Date: Wed Nov 11 17:59:14 2015 +0900 - - Skip disabled CRTCs in amdgpu_scanout_(do_)update - - The vblank / page flip ioctls don't work as expected for a disabled CRTC. - - (ported from radeon commit acc11877423ecd81a6e0a7f38466f80e43efee20) - - Reviewed-by: Alex Deucher - -commit 0ddd20600d0046afd17aa47ffebe86dfd91a2215 -Author: Michel Dänzer -Date: Wed Nov 11 17:44:16 2015 +0900 - - Prefer drmModeSetCursor2 over drmModeSetCursor - - The former includes information about the position of the hotspot within - the cursor image. - - Copied from xf86-video-modesetting. + Simplify drmmode_set_mode_major error handling - (ported from radeon commit c9f8f642fd495937400618a4fc25ecae3f8888fc) + Initialize ret = FALSE and only set it to TRUE when we've succeeded. Reviewed-by: Alex Deucher -commit 83a47c0ebe17caa79d12a8b2f94b59cc945452f5 -Author: Michel Dänzer -Date: Wed Nov 11 17:37:54 2015 +0900 - - PRIME: Don't advertise offload capabilities when acceleration is disabled - - Xorg tends to crash if the user tries to actually use the offload - capabilities with acceleration disabled. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57200 - (ported from radeon commit c74de9fec13fac2c836bb2a07ae6f90e1d61e667) - - Reviewed-by: Alex Deucher - -commit 560b7fe6dc66405762020f00e9a05918a36f3a17 -Author: Michel Dänzer -Date: Wed Nov 11 17:31:34 2015 +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. - - (ported from radeon commit cc615d06db0332fc6e673b55632bcc7bf957b44b) - - Reviewed-by: Alex Deucher - -commit ad77ad32c4a723447d3191d527cfa6de9f54d7ce -Author: Adam Jackson -Date: Wed Nov 11 17:20:21 2015 +0900 - - Use own thunk function instead of shadowUpdatePackedWeak - - I plan to delete the Weak functions from a future server. - - Signed-off-by: Adam Jackson - (ported from radeon commit 851b2cf8714618843725f6d067915375485ade9d) - - Reviewed-by: Alex Deucher - -commit f5ccea99c03b62acf3a25984aba617c665d80b7c -Author: Michel Dänzer -Date: Wed Nov 11 17:16:58 2015 +0900 - - dri2: Handle PRIME for source buffer as well in amdgpu_dri2_copy_region2 - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77810 - - (ported from radeon commit c84230d686c078aac1dc98d82153f8b02521b2e1) - - Reviewed-by: Alex Deucher - -commit 92e7c93d2f9c3036da1a17d7fccccb6f9e9eaa3d -Author: Michel Dänzer -Date: Mon Nov 2 18:29:24 2015 +0900 - - Move scrn/info declaration inside USE_GLAMOR in amdgpu_dri3_fd_from_pixmap - - Fixes warning when building with --disable-glamor: - - ../../src/amdgpu_dri3.c: In function 'amdgpu_dri3_fd_from_pixmap': - ../../src/amdgpu_dri3.c:135:16: warning: unused variable 'info' [-Wunused-variable] - AMDGPUInfoPtr info = AMDGPUPTR(scrn); - ^ - - Reported-by: Jammy Zhou - Reviewed-by: Alex Deucher +commit a3ca1500703837cbb8d49c554199a25dea7d5e1e +Author: Hans de Goede +Date: Wed Jun 1 15:14:32 2016 +0200 -commit c9bd1399a13cea2e1331af2c826ca054b88db071 -Author: Michel Dänzer -Date: Mon Nov 2 18:21:50 2015 +0900 - - Call AMDGPUFreeRec from AMDGPUFreeScreen_KMS even if info == NULL + Only add main fb if necessary - It's safe now. + If we're doing reverse-prime; or doing rotation the main fb is not used, + and there is no reason to add it in this case. + Signed-off-by: Hans de Goede + (Ported from xserver commit 4313122dea0df9affc280ee698e929489061ccc6) Reviewed-by: Alex Deucher -commit fb8444e731765588c0ff1e9053c1c7b73f5f0907 -Author: Michel Dänzer -Date: Mon Nov 2 18:20:41 2015 +0900 +commit 9ca1c24235ff5ab2e028333fc326e2eff008c574 +Author: Hans de Goede +Date: Wed Jun 1 15:11:05 2016 +0200 - Don't use AMDGPUEntPriv in AMDGPUFreeRec + Remove unnecessary fb addition from drmmode_xf86crtc_resize - It crashes if info == NULL. + drmmode_set_mode_major() is the only user of drmmode->fb_id and will + create it if necessary. + Signed-off-by: Hans de Goede + (Ported from xserver commit 877453212166fdc912e0d687cdecee11aba563b5) Reviewed-by: Alex Deucher -commit 8e7ee03f55c2f3874f6e84daeb5700f8b8037a51 -Author: Michel Dänzer -Date: Wed Oct 28 17:53:27 2015 +0900 - - Remove amdgpu_reference_drm_fd - - Increase pAMDGPUEnt->fd_ref in the probe code instead when we're reusing - the existing fd. - - The previous reference counting was imbalanced, so pAMDGPUEnt->fd_ref - could never go to 0. - - Reviewed-by: Jammy Zhou - -commit 6bab8fabb37eb131e131ce59446c214ded28f779 +commit 0d42082108c264568e2aadd15ace70e72388bc65 Author: Michel Dänzer -Date: Wed Oct 28 17:44:09 2015 +0900 +Date: Wed Jun 22 19:01:03 2016 +0900 - Remove info->dri2.drm_fd and info->drmmode->fd + Call amdgpu_glamor_create_screen_resources after ModifyPixmapHeader - Use pAMDGPUEnt->fd everywhere instead. - - Reviewed-by: Jammy Zhou - -commit 0530e39cc6b7340163e7f6bb6d82719d102ee6e9 -Author: Jammy Zhou -Date: Thu Oct 29 17:08:01 2015 +0900 - - Pass struct pci_device *pci_dev directly to amdgpu_get_scrninfo + Otherwise, glamor doesn't pick up the new screen pixmap size and + continues using the old size, leaving garbage in some areas after + enlarging the screen. - Instead of throwing away the type information by passing it as a void*. + Fixes regression from commit c315c00e44afc91a7c8e2eab5af836d9643ebb88 + ("Propagate failure from amdgpu_set_pixmap_bo"). - Signed-off-by: Michel Dänzer Reviewed-by: Alex Deucher -commit edf72afee3a25eae9827b4de3a013b541b78e213 -Author: Jammy Zhou -Date: Wed Oct 28 21:24:29 2015 +0800 - - Fix crash in PCI probe path (v4) - - The crash is caused by the NULL value returned by AMDGPUPTR(pScrn), - because the driverPrivate is not allocated yet in PciProbe phase, - and it is usually done in the PreInit phase. - - Use pAMDGPUEnt->fd instead of info->dri2.drm_fd to avoid AMDGPUInfoPtr - related code in amdgpu_open_drm_master, so that the crash can be fixed. - - v4: (md) Remove unused parameter entity_num, split out logically - separate changes - v3: some more cleanup - v2: switch to pAMDGPUEnt->fd, and update the commit message - - Signed-off-by: Jammy Zhou - Signed-off-by: Michel Dänzer - Reviewed-by: Alex Deucher (v3) - -commit cef725121eb0e56aa54d9c4665e36047373f4db7 -Author: Michel Dänzer -Date: Wed Oct 28 17:56:13 2015 +0900 - - Remove dead code from probe paths - - amdgpu_get_scrninfo allocates the memory pointed to by pAMDGPUEnt just - before it calls amdgpu_open_drm_master, so pAMDGPUEnt->fd is always 0 - in the latter. - - Also, no need to clear pAMDGPUEnt->fd just before freeing the memory - it's stored in. - - Reviewed-by: Jammy Zhou - -commit 3b0a3c89b53b3ebe21a9d703a4dbff6e57c65a57 -Author: Samuel Li -Date: Thu Oct 22 12:50:21 2015 -0400 - - Add Stoney support - - (agd): rebase - - Reviewed-by: Michel Dänzer - Signed-off-by: Samuel Li - -commit 9c8b7ebe15eec7abd5dc10ad6ccecbc57225494a +commit e7e71eabbbccdeabcae1bc6fffabc27c272090ab Author: Michel Dänzer -Date: Wed Oct 21 17:18:44 2015 +0900 +Date: Mon Mar 28 18:49:15 2016 +0900 - Revert "Handle RandR CRTC transforms properly" + Adapt to XF86_CRTC_VERSION 7 - This reverts commit 175251645fec1a3d19f498e1cd1e655374c67801. + Now the HW cursor can be used with TearFree rotation. - I accidentally pushed this patch. - -commit 0a6ba4bf50128464a30951721b0c72e748fb89bc -Author: Darren Powell -Date: Tue Oct 20 16:56:54 2015 -0400 - - Add Option "TearFree" to manpage + This also allows always using the separate scanout pixmap mechanism for + rotation, so that should be much smoother even without TearFree enabled. - This was missed in commit c57da33308a81fa575179238a0415abcb8b34908. - - Signed-off-by: Darren Powell + (Ported from radeon commit 7835558acdce318130ba4a09ef936fd675e3197d) Reviewed-by: Alex Deucher - Reviewed-by: Michel Dänzer - -commit 175251645fec1a3d19f498e1cd1e655374c67801 -Author: Michel Dänzer -Date: Thu Oct 15 16:35:51 2015 +0900 - - Handle RandR CRTC transforms properly - -commit 6000aef4e2f0a121b94023484406fb6f04688f74 -Author: Tom St Denis -Date: Wed Oct 14 13:25:59 2015 -0400 - - Clean up amdgpu_dri2_create_buffer2() - - Remove the depth_pixmap variable from the function and clear - out any dead/odd behaviour that results. - - Signed-off-by: Tom St Denis -commit 21e72fb2418b5cc7fc849a9cf951186e209036b0 +commit 7f7f9825caf3983902491da27c16d14cd8bf9b7d Author: Michel Dänzer -Date: Fri Oct 9 18:38:47 2015 +0900 +Date: Mon Jun 13 18:58:49 2016 +0900 - Properly handle drmModeAddFB failure in drmmode_crtc_scanout_allocate + Free priv in amdgpu_set_pixmap_bo also if priv->bo == NULL - We were printing an error message, but not propagating the failure. That - would probably lead to trouble down the road. + Fixes memory leak when destroying pixmaps with priv->bo == NULL. + Reported-by: Qiang Yu Reviewed-by: Alex Deucher -commit 8da1d0c870e1081d77925807d6e3bbc61a23f54f +commit 397aedafee437c125b8ac1feafb1c3b466842aeb Author: Michel Dänzer -Date: Fri Oct 9 18:59:16 2015 +0900 +Date: Mon Jun 13 18:34:11 2016 +0900 - Eliminate redundant data parameter from drmmode_crtc_scanout_create - - drmmode_crtc_scanout_create just needs to call - drmmode_crtc_scanout_allocate when scanout->bo is NULL. - - This makes it clearer to the reader / compiler that - drmmode_crtc_scanout_create doesn't dereference scanout->bo when it's - NULL. + glamor: Fix leak of pixmap private when replacing BO + Reported-by: Qiang Yu Reviewed-by: Alex Deucher -commit dc40582d5ff94d812cbc08f95cf14b80cd0f410d +commit 5b4a8a7a6ed70a50be252fa9b34d3b3a17cdf91a Author: Michel Dänzer -Date: Wed Oct 7 16:19:22 2015 +0900 - - Don't advertise rotation support without hardware acceleration v2 - - Rotation currently doesn't work without acceleration (doesn't actually - rotate with Option "NoAccel", crashes with Option "AccelMethod" "none" - or when glamor fails to initialize) and would probably be too slow - anyway. - - v2: Also remove now dead code checking for ShadowFB from - drmmode_crtc_scanout_allocate(). - - Reviewed-by: Alex Deucher - -commit 460560502a1bdf26d06f3c30df46fa9f28ffb9e5 -Author: Tom St Denis -Date: Tue Oct 6 08:49:54 2015 -0400 - - Simplify drmmode_set_mode_major() and avoid leaking memory. - - The function would leak the memory allocated for output_ids. This - patch addresses that as well as simplifies the logic somewhat. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit 56398d6651dfc4935cbd117ad861e1800077c73c -Author: Tom St Denis -Date: Tue Oct 6 08:43:12 2015 -0400 - - Avoid NULL dereference if drmmode_crtc_scanout_allocate fails - - This avoids a NULL dereference if the memory allocation fails. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit 4b92b960c7705be8b3a5dee17b2341864d7ca9bb -Author: Tom St Denis -Date: Mon Oct 5 10:00:09 2015 -0400 - - cleanup the entity rec - - Based on radeon commit: b32a0a3de84a44b9af4f1ca8be19f10d7fa31b12 - - Some of these were set, some of them were - always opposites, so clean things up. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit fe100fd6bf483228eaf64b959c56a68e8dac4447 -Author: Tom St Denis -Date: Mon Oct 5 10:45:33 2015 -0400 - - present: Handle DPMS off in radeon_present_get_ust_msc - - Based on radeon commit: 95f5d09e3667ded027ae648c97eb4737d8bf67c5 - - The DRM_IOCTL_WAIT_VBLANK ioctl may return an error during DPMS off, - which would trigger an error message in drmmode_crtc_get_ust_msc. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit bfa925a04815cee5fd57b99447cb2ee0e158036c -Author: Tom St Denis -Date: Mon Oct 5 10:10:51 2015 -0400 - - present: Look at all CRTCs to determine if we can flip - - Based on radeon commit 211862b777d0be251a4662f5dd24f2d400544c09 - - Inspired by modesetting driver change by Kenneth Graunke. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer +Date: Tue Jun 14 19:00:18 2016 +0900 -commit a1e47e76322619ed037ebce27974a4e3792940c2 -Author: Tom St Denis -Date: Mon Oct 5 10:41:22 2015 -0400 - - present: Fall back to modeset for unflip operation - - Based on radeon commit: 802d33e474a82262d9cdf11b03568b0c4929cd0d - - It's not always possible to use the page flip ioctl for this, e.g. - during DPMS off. We were previously just skipping the unflip in that - case, which could result in hangs when setting DPMS off while a - fullscreen Present app is running, e.g. at the GNOME3 lock screen. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit bac21dfc8e60a07f08158b13fab1f3a9b9d27d1b -Author: Tom St Denis -Date: Mon Oct 5 10:37:50 2015 -0400 - - Don't attempt a DRI2/Present page flip while the other one is flipping - - Based on radeon commit 49f5b0bc301414df049e00d226034e3d6e56421b - - Fixes corrupted display and hangs when switching between DRI2 and DRI3 - fullscreen apps, e.g. a compositor using DRI3 and a fullscreen app using - DRI2 or vice versa. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit a5f7f2e68bad1935f5ad52286033237467f77302 -Author: Tom St Denis -Date: Mon Oct 5 13:12:23 2015 -0400 - - Move amdgpu_drm_handler/abort_proc fields to drmmode_flipdata_re - - Based on radeon commit de5ddd09db82141b263338dcf0c28e01f58268ee - - Their values are the same for all DRM flip ioctl calls within a single - radeon_do_pageflip() call. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit e14e3560bff2537d3ad4c93d2b31442a122cde66 -Author: Tom St Denis -Date: Mon Oct 5 13:08:43 2015 -0400 - - Simplify amdgpu_do_pageflip() error handling slightly more - - Based on radeon commit e8c0f6319fbf4c3ea11e22ab1a68837031bdec8c - - We don't need the local variable old_fb_id. - - Signed-off-by: Tom St Denis - - [ Michel Dänzer: fix up slightly to better match radeon formatting ] - - Reviewed-by: Michel Dänzer - -commit e9621ec0e2400f62db320c560a739b29258edb87 -Author: Tom St Denis -Date: Mon Oct 5 09:34:47 2015 -0400 - - Increase robustness against DRM page flip ioctl failures - - Based on radeon commit 8fc22360d5520469c82092ccb0fcf2af330c573f - - Centralize cleanup, only clean up things that have been allocated for - the failed ioctl call. - - Fixes double-free after a flip ioctl failure. - - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89681 - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit db3bb2061b9ac16b0922d9afae99874820356a04 -Author: Tom St Denis -Date: Tue Sep 29 13:07:04 2015 -0400 - - Clean up allocation in AMDGPUInitVideo() - - The allocation of the adapters should use the correct sizeof (even if - allocating an array of pointers). - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit 94caf7ac777134b8396aa762a506053179bbb4c6 -Author: Tom St Denis -Date: Thu Oct 1 13:08:41 2015 -0400 - - Avoid leaking memory on output. - - Based on radeon commit 63dc36dc49f93cb00111b497ab6805194bc9d240 - - and 2nd patch: - - Proper leak fix, previous leak fix was bogus. - - Based on radeon commit b8ec9ed4fe86952763b963c86f0af0dcae69aa6c - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit f035faec041cb5df65c78effa58eb50197cedf88 -Author: Tom St Denis -Date: Thu Oct 1 12:56:05 2015 -0400 - - add support for DP 1.2 display hotplug - - Based on radeon commit 2f11dcd43966cf2ee26e61960fd72e6644f5e037 + Use amdgpu_set_pixmap_bo in amdgpu_set_shared_pixmap_backing - > This allows for dynamic creation of conneectors when the - > kernel tells us. - > - > v2: fix dpms off crash - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit aee72b29210d79dbf41bde6eef16d7fe817e6cf4 -Author: Tom St Denis -Date: Thu Oct 1 12:29:36 2015 -0400 - - move output name creation to its own function - - Based on radeon commit c88424d1f4aaa78b569e5d44f0b4a47de2f422f4 - - > The secondary indent is deliberate to make the next patch more - > parseable for mst support. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit 0846abeace649d27a5f2c17373e717f92d246797 -Author: Tom St Denis -Date: Thu Oct 1 12:13:21 2015 -0400 - - stop caching mode resources - - Based on radeon commit 32b003cb7657e07d5af6338ad44d768eda87fd33 - - > This is step one towards MST connector hotplug support, - > it stop caching the mode resources structure, and - > just passes a pointer to it around. - - With a few tweaks to match the state of the AMDGPU tree. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit 4ca8f957e0b417b099f625470db98a54531a731d -Author: Tom St Denis -Date: Thu Oct 1 13:16:15 2015 -0400 - - Silence type mismatch warning. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit a79735ab1499c1f7814036d1b19ff465705c5f45 -Author: Tom St Denis -Date: Thu Oct 1 10:51:07 2015 -0400 - - Add support for server managed fds - - Based on radeon commit ed0cfbb4fe77146b0b38f777bc28f3a4ea6da07f - - and 2nd patch: - - Fix building on older servers without xf86platformBus.h - - Based on radeon commit b50da3b96c212086cb58501dbe988d64f1f35b6d - - Signed-off-by: Tom St Denis - - [ Michel Dänzer: Fixed up amdgpu_kernel_open_fd() not to need - AMDGPUEntPriv(), which doesn't work yet at that point ] - - Signed-off-by: Michel Dänzer - Reviewed-by: Michel Dänzer - -commit b93934a9ed5e92f3a6eac6554c5c4fa2967a6dd0 -Author: Tom St Denis -Date: Thu Oct 1 10:05:36 2015 -0400 - - Add amdgpu_open_drm_master helper function - - Based on radeon commit 3d7861fe112f25874319d4cdc12b745fbcd359cf - - > This is a preparation patch for adding server-managed-fd support without it - > turning into a goto fest. - - With appropriate modifications because the open call stack is different - in the amdgpu tree. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit f5c3fd0b57cf9e392bf591110568637937a1d338 -Author: Tom St Denis -Date: Thu Oct 1 09:13:57 2015 -0400 - - Cleaning up for server-fd support - - Based on radeon commit a63342ad15408071437c80b411d14196f3288aed - - > radeon_open_drm_master get rid of unnecessary goto - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit 3055724aef76a624718f26d5f0f9e9d567ffbcfb -Author: Tom St Denis -Date: Thu Sep 24 13:08:31 2015 -0400 - - Simplify pick best crtc to fold two loops into one - - This patch folds the two for loops from amdgpu_pick_best_crtc() into - one to reduce the LOC and make the routine easier to read. - - Signed-off-by: Tom St Denis - Reviewed-by: Michel Dänzer - -commit 9945b4ae1664ab815b39ff07e7b66cfa7f942dfa -Author: Tom St Denis -Date: Wed Sep 9 09:38:02 2015 -0400 - - Avoid use-after-free in drmmode_output_destroy() + Fixes leaking any existing pixmap private. - The encoders array is freed before potentially all of the elements of - the array are individually freed. + While we're at it, also fix leaking the GBM BO if + amdgpu_glamor_create_textured_pixmap fails. - Signed-off-by: Tom St Denis - Reviewed-by: Christian König Reviewed-by: Alex Deucher - Signed-off-by: Michel Dänzer (cosmetic fixups) -commit 36b3faebdd1d2090a286616eeeb131d15e9a1386 -Author: Tom St Denis -Date: Wed Sep 9 09:36:59 2015 -0400 +commit c315c00e44afc91a7c8e2eab5af836d9643ebb88 +Author: Michel Dänzer +Date: Wed Jun 15 17:20:36 2016 +0900 - Avoid use-after-free in amdgpu_kernel_open_fd() + Propagate failure from amdgpu_set_pixmap_bo - If the device cannot be opened avoid re-using busid after it has been - freed. + Preparation for the following fixes. - Signed-off-by: Tom St Denis - Reviewed-by: Christian König Reviewed-by: Alex Deucher - Signed-off-by: Michel Dänzer (cosmetic fixups) -commit 8823c3d4c6db70cff7699b31088f2d92db8faaf4 -Author: Tom St Denis -Date: Wed Sep 9 09:34:38 2015 -0400 +commit 74602c4221e3c84949fd69f690cbc66dcae384ea +Author: Michel Dänzer +Date: Tue Jun 14 18:53:34 2016 +0900 - dri2: Avoid calculation with undefined msc value + glamor: Make amdgpu_glamor_create_textured_pixmap take amdgpu_buffer* - If the get_msc() call fails for any reason we should avoid updating the - vblank counter delta with undefined data. + Preparation for the following fixes. - Signed-off-by: Tom St Denis - Reviewed-by: Christian König - Acked-by: Alex Deucher - Signed-off-by: Michel Dänzer (minor fixups) + Reviewed-by: Alex Deucher -commit 63948ea091a9b324327ade7ec4fc5d67ca7e6f6f +commit 0007c2f018ba663303d91d847e7c085269a23062 Author: Michel Dänzer -Date: Fri Aug 14 18:41:57 2015 +0900 +Date: Wed Jun 8 16:27:33 2016 +0900 - DRI2: Keep MSC monotonic when moving window between CRTCs - - This mirrors the DRI3 implementation in xserver. Fixes VDPAU video - playback hanging when moving the window between CRTCs. + glamor: Reallocate linear pixmap BO if necessary for DRI2 PRIME - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66384 + Fixes corruption when using DRI2 PRIME render offloading with the master + screen using this driver. + Reported-by: Qiang Yu Reviewed-by: Alex Deucher + Tested-by: Qiang Yu -commit 55a4461bd95698cb8d52f9f6c28583f8f81afb4e +commit 5518bf5d793439b5bab369e5fc18de9a4a3b9dd6 Author: Michel Dänzer -Date: Fri Aug 7 11:46:31 2015 +0900 +Date: Wed Jun 8 16:44:26 2016 +0900 - Wait for scanout BO initialization to finish before setting mode + Move DRI2's local fixup_glamor helper to amdgpu_glamor_set_pixmap_bo v2 - This should avoid intermittent artifacts which could sometimes be visible - when setting a new scanout pixmap, e.g. on server startup or when - changing resolutions. + So it can be used outside of the DRI2 code. - (Ported from radeon commit 3791fceabf2cb037467dc41c15364e9f9ec1e47e) + v2: Keep pixmap refcnt increment in amdgpu_dri2_create_buffer2 (Qiang Yu) Reviewed-by: Alex Deucher + Tested-by: Qiang Yu (v1) -commit 4c425e9c5c038504a0f0498dd800ab1fb40bf0c5 +commit 641f4647b7f51dfd2da330376cd10fa9702b6423 Author: Michel Dänzer -Date: Fri Aug 7 12:39:24 2015 +0900 +Date: Wed Jun 8 16:39:10 2016 +0900 - glamor: Add amdgpu_glamor_finish to wait for glamor rendering to finish + Consolidate get_drawable_pixmap helper - This is a bit sneaky, because it calls glFinish directly from the driver, - but it seems to work fine. + There were two static helpers for the same purpose. Consolidate them + into a single inline helper which can be used anywhere. Reviewed-by: Alex Deucher + Tested-by: Qiang Yu -commit bb989e173dc364a7d68e50d7e819d0e0ee133d2f +commit 8e40f190e4704c2802bf0f073f17e742786d0f18 Author: Michel Dänzer -Date: Fri Aug 7 11:43:48 2015 +0900 +Date: Wed Jun 8 16:00:21 2016 +0900 - Only call drmmode_copy_fb (at most) once on server startup - - It doesn't make sense to copy the screen contents from console when VT - switching back to Xorg or when Xorg resets. - - Fixes intermittent artifacts when VT switching back from console to the - gdm login screen. + Add amdgpu_pixmap_get_tiling_info - (Ported from radeon commit 4e3dfa69e4630df2e0ec0f5b81d61159757c4664) + Retrieves the tiling information about a pixmap BO from the kernel + driver. Reviewed-by: Alex Deucher + Tested-by: Qiang Yu -commit ebe2c020fbf2ef8de01fc50b201ab23ddb9fb13b -Author: Mario Kleiner -Date: Mon Aug 10 23:34:40 2015 +0200 +commit e7eeb6ad1133b6023d34b4489959ae330a8e15dd +Author: Michel Dänzer +Date: Wed Jun 8 15:42:01 2016 +0900 - Make selection between DRI2 and DRI3 consistent with other drivers. (v2) + Remove amdgpu_share_pixmap_backing - Add Option "DRI" to allow selection of maximum DRI level. + Not used anymore. - This allows the user to select the maximum level of DRI - implementation to use, DRI2 or DRI3. It replaces the old - option "DRI3" which had exactly the same purpose, but - differs from the method used in both intel ddx and nouveau ddx. - Make this consistent before a new stable driver is released. + Reviewed-by: Alex Deucher + Tested-by: Qiang Yu + +commit b36c77695ba77b59a0ccd868454e3af4fc04d5ff +Author: Michel Dänzer +Date: Wed Jun 8 15:38:57 2016 +0900 + + glamor: Fix amdgpu_glamor_share_pixmap_backing for priv->bo == NULL - v2: Retain handling of old Option "DRI3" for backwards - compatibility, but Option "DRI" will take precedence - over "DRI3" if both are provided. + Fixes crash when running a compositor and DRI_PRIME client via DRI2. - Signed-off-by: Mario Kleiner - Reviewed-by: Michel Dänzer + Reported-by: Qiang Yu + Reviewed-by: Alex Deucher + Tested-by: Qiang Yu -commit c9611a2aa0f8d3bb55c552353740d60f6e4f63a0 +commit 60ced5026ebc34d9f32c7618430b6a7ef7c8eb4b Author: Alex Deucher -Date: Tue Jul 7 22:46:34 2015 -0400 +Date: Tue May 17 16:59:41 2016 -0400 - add fiji pci id + add missing bonaire pci id - Reviewed-by: Michel Dänzer Signed-off-by: Alex Deucher -commit 2622ac1554761b8824bfbbb2e3051a632ee38ce7 -Author: Alex Deucher -Date: Tue Jul 7 22:46:08 2015 -0400 +commit 8e89448ee00da16e05e6777f34bb75d2dd6f7025 +Author: Flora Cui +Date: Tue May 17 11:02:09 2016 +0800 + + Add more Polaris 11 PCI IDs + + Signed-off-by: Flora Cui + Reviewed-by: Christian König + Signed-off-by: Alex Deucher + +commit a59b23d64285741a7a25e314343f6261046d980f +Author: Flora Cui +Date: Mon May 16 17:25:34 2016 +0800 - Add fiji support + Add more Polaris 10 PCI IDs + Signed-off-by: Flora Cui + Reviewed-by: Alex Deucher Reviewed-by: Michel Dänzer Signed-off-by: Alex Deucher -commit 7a49d8728d17875206a84fd1023f62b37c4a9f51 +commit 14606e127f4b6eb0b00fd42cec13d524a67e4c4a Author: Michel Dänzer -Date: Thu Aug 6 18:21:30 2015 +0900 +Date: Thu May 12 16:38:56 2016 +0900 - On screen resize, clear the new buffer before displaying it + Handle Zaphod mode correctly in amdgpu_mode_hotplug + + We need to scan both screens of the entity for existing connectors, and + enumerate DVI & HDMI connectors consistently regardless of which screen + they're assigned to. - Fixes garbage being intermittently visible during a screen resize. + Fixes crash when hot-(un)plugging connectors in Zaphod mode. - (Ported from radeon commit 80f3d727f93cb6efedd2b39338d2301035965fe2) + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93415 + (Ported from radeon commit c801f9f10a5d72d935faf21e72f7e7808fb4f05f) Reviewed-by: Alex Deucher -commit 9f988bf1dc9d4cb92926c051ed8f15e9ba58a016 +commit 861da1d5c243f51d6c1f76e5b13e5184aa608776 Author: Michel Dänzer -Date: Thu Aug 6 17:50:11 2015 +0900 +Date: Thu May 12 16:34:30 2016 +0900 - Make drmmode_copy_fb() work with glamor + Enable DRI3 by default when building for Xorg >= 1.18.3 - Needed for Xorg -background none. + Seems to work well enough in general now. - (Ported from radeon commit 3999bf88cdb192fe2f30b03bd2ed6f6a3f9f9057) + (Ported from radeon commit 1181b9c582f10b6c523e4b2988e2ce87ecf3d367) Reviewed-by: Alex Deucher -commit 13cf61bd8d46b0059f26120a8902da6f86e6bd11 +commit 86f991838824494e68ac277fa27cbd88c23a5ee8 Author: Michel Dänzer