.editorconfig | 7 ChangeLog | 847 ++++++++++++++++++++++++++++++++++++++++----- autogen.sh | 2 configure.ac | 11 debian/changelog | 7 debian/control | 2 man/amdgpu.man | 10 src/amdgpu_bo_helper.c | 45 +- src/amdgpu_chipset_gen.h | 21 + src/amdgpu_dri2.c | 11 src/amdgpu_dri3.c | 9 src/amdgpu_drm_queue.c | 7 src/amdgpu_drm_queue.h | 2 src/amdgpu_drv.h | 7 src/amdgpu_glamor.c | 14 src/amdgpu_glamor.h | 2 src/amdgpu_kms.c | 665 ++++++++++++++++++++++++++++++----- src/amdgpu_pixmap.h | 15 src/amdgpu_present.c | 68 ++- src/amdgpu_probe.c | 7 src/amdgpu_probe.h | 2 src/amdgpu_video.c | 2 src/compat-api.h | 9 src/drmmode_display.c | 615 ++++++++++++++++---------------- src/drmmode_display.h | 21 - src/pcidb/parse_pci_ids.pl | 12 26 files changed, 1828 insertions(+), 592 deletions(-)
New commits: commit 339800938d2d5ecd3726c4420b9971004f3b4eb1 Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Nov 17 11:21:48 2016 +0200 release to sid diff --git a/debian/changelog b/debian/changelog index 073e911..79f36f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-video-amdgpu (1.2.0-1) UNRELEASED; urgency=medium +xserver-xorg-video-amdgpu (1.2.0-1) unstable; urgency=medium * New upstream release. * control: Bump policy to 3.9.8, no changes. - -- Timo Aaltonen <tjaal...@debian.org> Thu, 17 Nov 2016 11:08:55 +0200 + -- Timo Aaltonen <tjaal...@debian.org> Thu, 17 Nov 2016 11:21:36 +0200 xserver-xorg-video-amdgpu (1.1.2-1) unstable; urgency=medium commit b442881da456615e0d66ab05a86e468a72000c53 Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Nov 17 11:10:57 2016 +0200 control: Bump policy to 3.9.8, no changes. diff --git a/debian/changelog b/debian/changelog index d4ab8ec..073e911 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-amdgpu (1.2.0-1) UNRELEASED; urgency=medium * New upstream release. + * control: Bump policy to 3.9.8, no changes. -- Timo Aaltonen <tjaal...@debian.org> Thu, 17 Nov 2016 11:08:55 +0200 diff --git a/debian/control b/debian/control index 4fde0bb..fb581b7 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: x11proto-xf86dri-dev, xserver-xorg-dev (>= 2:1.16), xutils-dev (>= 1:7.5+4) -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-amdgpu.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-video-amdgpu.git commit fe3caba50ec9e959137393168fd2c12a3be29c02 Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Nov 17 11:10:05 2016 +0200 update changelogs diff --git a/ChangeLog b/ChangeLog index abf4079..d0c58ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,228 @@ -commit b407c1244d28a80f76275abca2239cdd4120f017 +commit a00032050873fc99f3ceaa3293468dad1d94d4b1 Author: Michel Dänzer <michel.daen...@amd.com> -Date: Fri Sep 16 18:11:31 2016 +0900 +Date: Thu Nov 17 15:17:10 2016 +0900 - Bump version for 1.1.2 release + Bump version for 1.2.0 release -commit 82062157263d6f63ce8f645bf32101fd18bd98e5 +commit a446b3af9b055056e9fb0f37069b08b979eba277 Author: Michel Dänzer <michel.daen...@amd.com> -Date: Fri Sep 16 18:01:41 2016 +0900 +Date: Thu Nov 17 15:13:59 2016 +0900 + + manpage updates for the 1.2.0 release + + Option "TearFree" is now effective for arbitrary transforms as well. + + Point to the amd-gfx mailing list instead of xorg-driver-ati. + +commit 24e36c7044a24294d5709c0306efacc8de6df072 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Nov 10 12:30:10 2016 +0900 + + Use pAMDGPUEnt to find both screens of a GPU in amdgpu_mode_hotplug + + Fixes misbehaviour when hotplugging DisplayPort connectors on secondary + GPUs. + + Fixes: 14606e127f4b ("Handle Zaphod mode correctly in amdgpu_mode_hotplug") + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98626 + (Ported from radeon commit 9760ef33cba5795eddeda4d5c2fcbe2dcce21689) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 257be5b0853814a557a5337878a4311acbc89856 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Nov 10 12:28:03 2016 +0900 + + Refactor amdgpu_mode_hotplug + + Preparation for the next change, no functional change intended. + + (Cherry picked from radeon commit 35bec4937d89b48a79acfcb4f814b7370cb631b2) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 1352a1d2f78cb0433d421ef86bfce2a5a1646807 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Nov 2 12:35:55 2016 +0900 + + Check Xorg version at runtime instead of build time in two places + + This means that all possible paths can be handled as intended, no matter + which Xorg version the driver happened to be compiled against. + + (Ported from radeon commit 350a2645a1b127227ff294c0b62d20000d0fd48a) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 5da43c5da8adc139d57d89975a52eef91a5595e1 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Tue Nov 1 16:01:24 2016 +0900 + + Require xserver 1.10 or newer + + 1.10.0 was released in February 2011. + + We've been accidentally requiring 1.10 or newer since c7d27c94cb65 ("Keep + track of damage event related flushes per-client"). + + (Ported from radeon commit 5df36de39952c3a26cb2fbc125f298139a9dd5bc) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit dd4a740714e481b09312a04883aa6e0f5200ca81 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Oct 27 11:22:36 2016 +0900 + + present: Check tiling info for flips + + The kernel driver doesn't handle flipping between buffers with + different tiling parameters correctly. + + Fixes display corruption with fullscreen apps using different tiling + modes (e.g. due to R600_DEBUG=notiling or R600_DEBUG=no2d) via DRI3. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 3c1f4386ba7d0b6c16bdd2b2178f978f2f154ba8 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Oct 26 16:19:01 2016 +0900 + + Consume all available udev events at once + + We get multiple udev events for actions like docking a laptop into its + station or plugging a monitor to the station. By consuming as many + events as we can, we reduce the number of output re-evalutions. + + It depends on the timing how many events can be consumed at once. + + (Inspired by xserver commit 363f4273dd4aec3e26cc57ecb6c20f27e6c813d8) + (Ported from radeon commit 22b5ce9548393ba2ff73ee234ecd82eeaf0ef6c4) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit c87dff3257e797cfd80d208c9a612b21978ff4eb +Author: Hans de Goede <hdego...@redhat.com> +Date: Wed Oct 26 16:17:04 2016 +0900 + + PRIME: Fix swapping of provider sink / source capabilities + + When a card has import capability it can be an offload _sink_, not a + source and vice versa for export capability. + + This went unnoticed sofar because most gpus have both import and export + capability. + + Signed-off-by: Hans de Goede <hdego...@redhat.com> + (Ported from xserver commit 94a1c77259ce39ba59ad87615df39b570ffab435) + (Ported from radeon commit 82d3c8f5500d2a6fb1495e217a0b79c396f1534c) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 9c4416422f2d07dbfa7c0b18beb1353f122fc1a1 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Oct 26 16:15:42 2016 +0900 + + Always call PixmapStopDirtyTracking in drmmode_set_scanout_pixmap + + Otherwise, we may leak screen->pixmap_dirty_list entries if + drmmode_set_scanout_pixmap is called repatedly with ppix != NULL, which + can happen from RRReplaceScanoutPixmap. + + (Inspired by xserver commit b773a9c8126222e5fed2904d012fbf917a9f22fd) + (Ported from radeon commit 6c940446ddadf418ee4959e46fa552b6c1cf6704) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 0a91f11c03400e3f92a2b048505f39e7de7e87fc +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Oct 26 16:14:45 2016 +0900 + + Don't rely on randr_crtc->scanout_pixmap in drmmode_set_scanout_pixmap + + RRReplaceScanoutPixmap may set randr_crtc->scanout_pixmap = NULL before + we get here. + + (Inspired by xserver commit f4c37eeee7953df1fe0e3196eda452acf0078e61) + v2: Always return TRUE in the if (!ppix) block. + (Cherry picked from radeon commit 61df12e2377cbb19a19ca9d5624df8959822da9f) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit b37f4774880bfd0cbe50273ac0d9c539d81995f9 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Tue Oct 25 16:30:46 2016 +0900 + + Sayōnara, AM_MAINTAINER_MODE! + + If --enable-maintainer-mode got lost from config.status for any reason, + builds would fail in mysterious ways after changing between different + Git commits. + + There are more reasons for dropping it in the automake manual: + + https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html + + I'm not aware of any reason why --disable-maintainer-mode would ever be + useful with this project. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + (Cherry picked from radeon commit 49cf3b5032a7ce40afe514b7092440e3e19e05aa) + +commit c8d9ad0e188d3da3a35006a00536d61e23305830 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Oct 19 18:16:47 2016 +0900 + + Order unique chipsets according to first appearance in ati_pciids.csv + + Instead of lexically. This makes it more likely for similar generations + to be close to each other in the list of unique chipsets. + + (Ported from radeon commit 1ce1b1656acc6211deb2091ff7f28d51b6daf86b, + plus change $numunique++ => ++$numunique to fix OLAND getting listed + twice) + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 7cc04035c55788261cda89a915c433c2add6cad9 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Sep 28 15:59:22 2016 +0900 + + Enable HW cursor support with PRIME slave output & Xorg > 1.18.99.901 + + Supported since Xorg 1.18.99.2, but buggy until 1.18.99.901. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit d42773eb45baff5933730e26878a0b45fcf07b65 +Author: Michel Dänzer <michel.daen...@amd.com> +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 <alexander.deuc...@amd.com> + +commit bdee9f4dd4f21015e7696e06c4b485ab2b3a16dc +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Aug 31 16:46:56 2016 +0900 + + Add support for ScreenPtr::SyncSharedPixmap + + This allows deferring shared pixmap updates between different drivers. + + (Ported from radeon commit 53be26b00e83f871f0afd39caa5a7a1d6ec4aea1) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 97d7386caf7ba53d2cf398b8a9bb65d0a2a4770a +Author: Michel Dänzer <michel.daen...@amd.com> +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 <alexander.deuc...@amd.com> + +commit aa8a3fa2468094cd37959179e8417ba7ba0a326c +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Fri Sep 16 15:59:16 2016 +0900 Fix handling of configure option --with-xorg-conf-dir @@ -28,17 +244,10 @@ Date: Fri Sep 16 18:01:41 2016 +0900 Reported-by: Timo Aaltonen <tjaal...@debian.org> Reviewed-by: Julien Cristau <jcris...@debian.org> - (Cherry picked from commit aa8a3fa2468094cd37959179e8417ba7ba0a326c) - -commit 6eb2b507d9ec8dcde2482a5ebf59c001933e10ea -Author: Michel Dänzer <michel.daen...@amd.com> -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 <michel.daen...@amd.com> -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,63 +260,236 @@ Date: Thu Sep 15 15:28:12 2016 +0900 This matches what some (though not all) input drivers are doing for their xorg.conf.d snippets. + +commit 0f8df8584ad61a3e47fe303b34cd7b0c4ed08bb0 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Sep 8 18:14:49 2016 +0900 + + Make TearFree effective with PRIME slave scanout + + TearFree can now prevent tearing with any possible display + configuration. + + Note that there may still be inter-GPU tearing if the primary GPU uses + a different driver. - (Cherry picked from commit cd3acb75718dfd42dd25d58b4e7bd4db27b659d8) + (Ported from radeon commit 38797a33117222dadbc89e5f21ed8cd5deef9bea) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> -commit ca1cf24d4eb773f7380c0da3fa942a5c85074422 -Author: Marek Olšák <marek.ol...@amd.com> -Date: Wed Sep 14 17:30:19 2016 +0900 +commit d6feed2cd78fe879aba4860a6d9bc2e388b9f135 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Sep 8 17:56:24 2016 +0900 - Fix cursor size for SI + Synchronize scanout pixmaps for TearFree - Reviewed-by: Michel Dänzer <michel.daen...@amd.com> - Acked-by: Edward O'Callaghan <funfunc...@folklore1984.net> - (Cherry picked from commit c4364520691d18961f0a6b77071baeeffaa80a11) + 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 <alexander.deuc...@amd.com> -commit ca84c49c88235e1909d11e192eada816b782f041 -Author: Ronie Salgado <ronies...@gmail.com> -Date: Wed Sep 14 17:30:30 2016 +0900 +commit 4927b84ec84bc0cb5055686cca6be54390f82803 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Sep 8 17:52:25 2016 +0900 - Add SI PCI IDs + Move up amdgpu_scanout_extents_intersect - Reviewed-by: Michel Dänzer <michel.daen...@amd.com> - (Cherry picked from commit 2eb5d77b841e55e7328df4b95c0d41fec30ce10f) + Will be needed higher up by the following changes. No functional change. + + (Ported from radeon commit 2f6e5fb15f1a9ce523c85550e493f8bda9d0c00f) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 1c725f63961746258f6138b47037ec18bf508d78 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Sep 8 17:45:32 2016 +0900 + + Factor out transform_region helper + + (Ported from radeon commit 5a57005178fc13b6f7e513458ca6dae72a3e5783) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit c92842764f95fa09e145d81f80e9fa39ea8c453c +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Sep 8 17:26:18 2016 +0900 + + Only copy from screen pixmap to shared pixmap on demand for slave scanout + + 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. + + This initial implementation only works when both the master and slave + screens use this driver. + + (Ported from radeon commit 99232f64db52812a843cd616d263d3a6b90eef3d) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 61ceefe17fe9e6ffbaaad0e216b2bd37fd39f47d +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Sep 8 17:15:03 2016 +0900 + + Track damage accurately for RandR 1.4 slave scanout + + This further reduces the PCIe bandwidth usage. + + (Ported from radeon commit b0867063abb197b9134166706d99fcbe5f204bb5, + plus leak fix from 5a57005178fc13b6f7e513458ca6dae72a3e5783) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> -commit e80321016f7cab9d46f83b785d576d7f02e680ed +commit 6d31fb124d4418e64c949bde9ed1facf95967762 Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 17:20:28 2016 +0900 +Date: Thu Sep 8 17:04:05 2016 +0900 + + Handle RandR 1.4 slave dirty updates via amdgpu_drm_queue + + This reduces PCIe bandwidth usage and tearing. + + (Ported from radeon commit ad0a0656dd0e74683e6d7789decba827aa29c221) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit b10ecdbd89b0a60a990c78c3e53bab6c4c96fe9f +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Sep 8 16:48:59 2016 +0900 + + Use drmmode_crtc_scanout_* helpers for RandR 1.4 scanout pixmaps + + 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. + + (Ported from radeon commits 4cfa4615f79f64062e5e771cd45dd7048f48b4f6 + and a92c27484703abc7c410b6ae0e4b8d1efbbb8e6f) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 9565981f751b0884cbfa885b8f3af3d41a965a2b +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Sep 7 18:49:54 2016 +0900 + + Wait for pending flips to complete before turning off an output or CRTC + + At least with older kernels, the flip may never complete otherwise, + which can result in us hanging in drmmode_set_mode_major. + + 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 <alexander.deuc...@amd.com> + +commit c7d27c94cb656899746898c2e55407c3e3d7cdc8 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Sep 7 18:28:23 2016 +0900 + + Keep track of damage event related flushes per-client + + 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 <alexander.deuc...@amd.com> + +commit 58773d1945cfa8155d8a6c5eb3f95097535604ef +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Sep 7 18:14:10 2016 +0900 + + Use EventCallback to avoid flushing every time in the FlushCallback + + 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 <alexander.deuc...@amd.com> + +commit d166d04f6951f6a48d7d5ce5d31bba857fe0cb06 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Sep 7 18:03:05 2016 +0900 + + Add explicit AMDGPU_DRM_QUEUE_ERROR define + + 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 <alexander.deuc...@amd.com> + +commit 6a1ba044c2b71081e6060d0c096917d6238f2145 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Mon Aug 29 16:43:59 2016 +0900 + + Only list each unique chipset family once in the log file + + Acked-by: Christian König <christian.koe...@amd.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 7d050d15d49ef25e86e7abe88dafb52370715640 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Mon Aug 29 16:13:20 2016 +0900 Add missing Kaveri PCI ID (1318) Found by comparing src/pcidb/ati_pciids.csv with xf86-video-ati. Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> - (Cherry picked from commit 7d050d15d49ef25e86e7abe88dafb52370715640) -commit 772e43d3e890b193ba24274bf629c8304f17cebc +commit aa5492660958e359bdc2107cba9a211ff988c90e Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 17:19:58 2016 +0900 +Date: Mon Aug 29 15:52:48 2016 +0900 Add Mullins PCI IDs Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97472 Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> - (Cherry picked from commit aa5492660958e359bdc2107cba9a211ff988c90e) -commit 3edf690d391b290066a3f39eb24695b8c8a0aaab +commit 73c8dc000ad6b2b53ba3aa7155f5e8f6b55623b7 Author: Qiang Yu <qiang...@amd.com> -Date: Wed Sep 14 17:19:29 2016 +0900 +Date: Mon Aug 22 19:13:26 2016 +0800 DRI2: Fix amdgpu_dri2_exchange_buffers width/height copy'n'paste error Signed-off-by: Qiang Yu <qiang...@amd.com> Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Reviewed-by: Michel Dänzer <michel.daen...@amd.com> - (Cherry picked from commit 73c8dc000ad6b2b53ba3aa7155f5e8f6b55623b7) -commit 0b3bde7f9e42577b6720cb290d03fab3b05614b4 +commit 5a4d3267ac3823fe58b51b0b9075b82375d7180c Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 17:18:51 2016 +0900 +Date: Wed Aug 17 18:57:01 2016 +0900 + + Remove unused lut_r/g/b arrays from drmmode_crtc_private_rec + + Fixes: 1091f28e1fa2 ("Remove drmmode_load_palette") + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit c4364520691d18961f0a6b77071baeeffaa80a11 +Author: Marek Olšák <marek.ol...@amd.com> +Date: Fri Aug 19 12:42:38 2016 +0200 + + Fix cursor size for SI + + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + Acked-by: Edward O'Callaghan <funfunc...@folklore1984.net> + +commit 2eb5d77b841e55e7328df4b95c0d41fec30ce10f +Author: Ronie Salgado <ronies...@gmail.com> +Date: Thu Feb 11 03:00:14 2016 -0300 + + Add SI PCI IDs + + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit abd1a7901c95e4bc78415cf1b7923623b9177152 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jun 29 17:54:26 2016 +0900 DRI2: Add interpolated_vblanks in amdgpu_dri2_get_crtc_msc @@ -120,11 +502,39 @@ Date: Wed Sep 14 17:18:51 2016 +0900 window between CRTCs. Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> - (Cherry picked from commit abd1a7901c95e4bc78415cf1b7923623b9177152) -commit 2e6e81aa8d4b33eb326e674dca4e29b3d638cac0 +commit 978242977e5dc905e1d5a46b1b0d34b356c7af26 +Author: Qiang Yu <qiang...@amd.com> +Date: Wed Jul 13 19:25:12 2016 +0800 + + 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 <qiang...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit fdd1209e26128b3e894f2867fac3a1b08fe1f29e +Author: Keith Packard <kei...@keithp.com> +Date: Tue Jul 19 09:16:32 2016 -0700 + + Use NotifyFd for drm fd + + NotifyFd is available after API 22, and must be used after API 23. + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 17c0cf49746a20fb25610c24a40c441f88c08365 +Author: Adam Jackson <a...@redhat.com> +Date: Tue Jul 19 10:03:56 2016 -0400 + + Adapt Block/WakeupHandler signature for ABI 23 + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit b5e2b964b7884c205a7c0fa578e05e867c176fcc Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 17:17:39 2016 +0900 +Date: Wed Jul 6 17:46:56 2016 +0900 Only use RandR APIs if RandR is enabled @@ -134,11 +544,55 @@ Date: Wed Sep 14 17:17:39 2016 +0900 (Ported from radeon commit 3be841d0ae7d505cef325993205b12d15e98dba9) Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> - (Cherry picked from commit b5e2b964b7884c205a7c0fa578e05e867c176fcc) -commit 01565e4427b192c7c55a820f1fb762e852859903 +commit 84496ebc89a9973347c774c13ff6f4667fcdbe69 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jul 6 17:43:36 2016 +0900 + + Add .editorconfig file + + Basically a conversion from .dir-locals.el. EditorConfig supports many + more editors and IDEs. + + (Ported from radeon commit aa07b365d7b0610411e118f105e49daff5f5a5cf) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit a576430526cbc404de64b30e1377a356644e8024 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Fri Jun 24 16:28:25 2016 +0900 + + Clear damage in amdgpu_scanout_update if it doesn't intersect the CRTC + + There's no need to test that same damage again. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit ede7f2bcae63be65e05e3029bfe7c742e5978932 Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 17:16:49 2016 +0900 +Date: Fri Jun 24 16:19:15 2016 +0900 + + Remove w/h parameters from amdgpu_scanout_extents_intersect + + We can use the dimensions of the CRTC's mode instead. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit bf000ea7ef91f5ecb59fc3c1ab8ed9eddcc0841d +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Jun 23 17:28:16 2016 +0900 + + Make the dedicated scanout mechanism work with arbitrary transforms v2 + + This makes TearFree work with arbitrary transforms, and makes transforms + work better even without TearFree, with xserver >= 1.12. + + v2: Preserve clamping of transformed damage extents to CRTC boundaries. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit d96dabc71b1b32dc4b422a9633cdd4e0e95da052 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Jun 23 16:27:45 2016 +0900 Destroy all dedicated scanout buffers during CloseScreen @@ -146,11 +600,186 @@ Date: Wed Sep 14 17:16:49 2016 +0900 fixes server reset with glamor and active scanout buffers. Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> - (Cherry picked from commit d96dabc71b1b32dc4b422a9633cdd4e0e95da052) -commit 7977f39d3c7847aeba2a06f4923f12eee27b4474 +commit 1091f28e1fa239ee1a973d84a8376fa4a95d7247 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Jun 23 12:47:04 2016 +0900 + + Remove drmmode_load_palette + + Not used by any supported version of xserver. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 4d506c23c9a628204fa23607931557b07ada3e31 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jun 22 17:16:24 2016 +0900 + + present: Separate checks for flips vs unflips v2 + + 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 <alexander.deuc...@amd.com> + +commit decabd574f90d3df397c80ec931b3fde8a4afb49 Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 16:50:36 2016 +0900 +Date: Wed Jun 22 17:43:41 2016 +0900 + + dri2: Don't allow flipping when using a dedicated scanout buffer + + Fixes issues when mixing rotation and page flipping with current xserver + Git master. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 3ed28ce7cd26f89969617ba901ff253091d0d469 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jun 22 16:54:01 2016 +0900 + + present: Don't allow flipping when using a dedicated scanout buffer + + Fixes issues when mixing rotation and page flipping with current xserver + Git master. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 9c3324715fd395fd486ea341654d78f4f298b97f +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jun 22 16:12:32 2016 +0900 + + Make sure drmmode_crtc->scanout[] are destroyed when not needed + + We failed to do this when going back to scanning out directly from the + screen pixmap. + + 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 <alexander.deuc...@amd.com> + +commit 3bce0519a4008cf87c0e31a7a579e10f5dcdd2f3 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jun 22 16:19:07 2016 +0900 + + Simplify drmmode_set_mode_major error handling + + Initialize ret = FALSE and only set it to TRUE when we've succeeded. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit a3ca1500703837cbb8d49c554199a25dea7d5e1e +Author: Hans de Goede <hdego...@redhat.com> +Date: Wed Jun 1 15:14:32 2016 +0200 + + Only add main fb if necessary + + 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 <hdego...@redhat.com> + (Ported from xserver commit 4313122dea0df9affc280ee698e929489061ccc6) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 9ca1c24235ff5ab2e028333fc326e2eff008c574 +Author: Hans de Goede <hdego...@redhat.com> +Date: Wed Jun 1 15:11:05 2016 +0200 + + Remove unnecessary fb addition from drmmode_xf86crtc_resize + + drmmode_set_mode_major() is the only user of drmmode->fb_id and will + create it if necessary. + + Signed-off-by: Hans de Goede <hdego...@redhat.com> + (Ported from xserver commit 877453212166fdc912e0d687cdecee11aba563b5) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 0d42082108c264568e2aadd15ace70e72388bc65 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jun 22 19:01:03 2016 +0900 + + Call amdgpu_glamor_create_screen_resources after ModifyPixmapHeader + + 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. + + Fixes regression from commit c315c00e44afc91a7c8e2eab5af836d9643ebb88 + ("Propagate failure from amdgpu_set_pixmap_bo"). + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit e7e71eabbbccdeabcae1bc6fffabc27c272090ab +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Mon Mar 28 18:49:15 2016 +0900 + + Adapt to XF86_CRTC_VERSION 7 + + Now the HW cursor can be used with TearFree rotation. + + This also allows always using the separate scanout pixmap mechanism for + rotation, so that should be much smoother even without TearFree enabled. + + (Ported from radeon commit 7835558acdce318130ba4a09ef936fd675e3197d) + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 7f7f9825caf3983902491da27c16d14cd8bf9b7d +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Mon Jun 13 18:58:49 2016 +0900 + + Free priv in amdgpu_set_pixmap_bo also if priv->bo == NULL + + Fixes memory leak when destroying pixmaps with priv->bo == NULL. + + Reported-by: Qiang Yu <qiang...@amd.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 397aedafee437c125b8ac1feafb1c3b466842aeb +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Mon Jun 13 18:34:11 2016 +0900 + + glamor: Fix leak of pixmap private when replacing BO + + Reported-by: Qiang Yu <qiang...@amd.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 5b4a8a7a6ed70a50be252fa9b34d3b3a17cdf91a +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Tue Jun 14 19:00:18 2016 +0900 + + Use amdgpu_set_pixmap_bo in amdgpu_set_shared_pixmap_backing + + Fixes leaking any existing pixmap private. + + While we're at it, also fix leaking the GBM BO if + amdgpu_glamor_create_textured_pixmap fails. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit c315c00e44afc91a7c8e2eab5af836d9643ebb88 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jun 15 17:20:36 2016 +0900 + + Propagate failure from amdgpu_set_pixmap_bo + + Preparation for the following fixes. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 74602c4221e3c84949fd69f690cbc66dcae384ea +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Tue Jun 14 18:53:34 2016 +0900 + + glamor: Make amdgpu_glamor_create_textured_pixmap take amdgpu_buffer* + + Preparation for the following fixes. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 0007c2f018ba663303d91d847e7c085269a23062 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Jun 8 16:27:33 2016 +0900 glamor: Reallocate linear pixmap BO if necessary for DRI2 PRIME @@ -160,11 +789,10 @@ Date: Wed Sep 14 16:50:36 2016 +0900 Reported-by: Qiang Yu <qiang...@amd.com> Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Tested-by: Qiang Yu <qiang...@amd.com> - (Cherry picked from commit 0007c2f018ba663303d91d847e7c085269a23062) -commit 062a7b9b81473969e5ca6034e5369106bf3088c4 +commit 5518bf5d793439b5bab369e5fc18de9a4a3b9dd6 Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 16:49:53 2016 +0900 +Date: Wed Jun 8 16:44:26 2016 +0900 Move DRI2's local fixup_glamor helper to amdgpu_glamor_set_pixmap_bo v2 @@ -174,11 +802,10 @@ Date: Wed Sep 14 16:49:53 2016 +0900 Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Tested-by: Qiang Yu <qiang...@amd.com> (v1) - (Cherry picked from commit 5518bf5d793439b5bab369e5fc18de9a4a3b9dd6) -commit 7dc2c5bae56a0c2aab38a9d8e77966b5d2f22ff2 +commit 641f4647b7f51dfd2da330376cd10fa9702b6423 Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 16:48:46 2016 +0900 +Date: Wed Jun 8 16:39:10 2016 +0900 Consolidate get_drawable_pixmap helper @@ -187,11 +814,10 @@ Date: Wed Sep 14 16:48:46 2016 +0900 Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Tested-by: Qiang Yu <qiang...@amd.com> - (Cherry picked from commit 641f4647b7f51dfd2da330376cd10fa9702b6423) -commit 5be3295cb2068d0b8234344f66ece245e4fa7999 +commit 8e40f190e4704c2802bf0f073f17e742786d0f18 Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 16:43:48 2016 +0900 +Date: Wed Jun 8 16:00:21 2016 +0900 Add amdgpu_pixmap_get_tiling_info @@ -200,11 +826,10 @@ Date: Wed Sep 14 16:43:48 2016 +0900 Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Tested-by: Qiang Yu <qiang...@amd.com> - (Cherry picked from commit 8e40f190e4704c2802bf0f073f17e742786d0f18) -commit 8cd5aa76c7d7fc48f42c31020306ea871e9edda2 +commit e7eeb6ad1133b6023d34b4489959ae330a8e15dd Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 16:43:10 2016 +0900 +Date: Wed Jun 8 15:42:01 2016 +0900 Remove amdgpu_share_pixmap_backing @@ -212,11 +837,10 @@ Date: Wed Sep 14 16:43:10 2016 +0900 Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Tested-by: Qiang Yu <qiang...@amd.com> - (Cherry picked from commit e7eeb6ad1133b6023d34b4489959ae330a8e15dd) -commit 0af88ed18a22b7d038c735093236c54eadc3b118 +commit b36c77695ba77b59a0ccd868454e3af4fc04d5ff Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Sep 14 16:42:39 2016 +0900 +Date: Wed Jun 8 15:38:57 2016 +0900 glamor: Fix amdgpu_glamor_share_pixmap_backing for priv->bo == NULL @@ -225,31 +849,28 @@ Date: Wed Sep 14 16:42:39 2016 +0900 Reported-by: Qiang Yu <qiang...@amd.com> Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Tested-by: Qiang Yu <qiang...@amd.com> - (Cherry picked from commit b36c77695ba77b59a0ccd868454e3af4fc04d5ff) -commit 0d5b6957aef95872dd34ba0eb4284ebe70ee685d +commit 60ced5026ebc34d9f32c7618430b6a7ef7c8eb4b Author: Alex Deucher <alexander.deuc...@amd.com> -Date: Wed Sep 14 16:41:46 2016 +0900 +Date: Tue May 17 16:59:41 2016 -0400 add missing bonaire pci id Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> - (Cherry picked from commit 60ced5026ebc34d9f32c7618430b6a7ef7c8eb4b) -commit 10ff4b42eaa946364b19e9433bc85748e1db2835 +commit 8e89448ee00da16e05e6777f34bb75d2dd6f7025 Author: Flora Cui <flora....@amd.com> -Date: Wed Sep 14 16:41:16 2016 +0900 +Date: Tue May 17 11:02:09 2016 +0800 Add more Polaris 11 PCI IDs Signed-off-by: Flora Cui <flora....@amd.com> Reviewed-by: Christian König <christian.koe...@amd.com> Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>