ChangeLog | 1459 ++++++++++++++++++++++++++++++++++++++ configure.ac | 5 debian/changelog | 12 debian/control | 11 debian/upstream/signing-key.asc | 26 debian/watch | 2 man/amdgpu.man | 14 src/Makefile.am | 3 src/amdgpu_bo_helper.c | 5 src/amdgpu_chipinfo_gen.h | 1 src/amdgpu_chipset_gen.h | 1 src/amdgpu_dri2.c | 292 ++++--- src/amdgpu_dri2.h | 1 src/amdgpu_dri3.c | 9 src/amdgpu_drv.h | 4 src/amdgpu_glamor.c | 4 src/amdgpu_kms.c | 157 ++-- src/amdgpu_pci_chipset_gen.h | 1 src/amdgpu_pci_device_match_gen.h | 1 src/amdgpu_present.c | 98 +- src/amdgpu_probe.c | 66 + src/amdgpu_probe.h | 10 src/amdgpu_video.c | 62 - src/amdgpu_video.h | 1 src/ati_pciids_gen.h | 1 src/drmmode_display.c | 574 ++++++++++---- src/drmmode_display.h | 17 src/pcidb/ati_pciids.csv | 1 28 files changed, 2389 insertions(+), 449 deletions(-)
New commits: commit 34694a9a2629520be0a2187f8137091f35b0f39d Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Nov 19 12:57:34 2015 +0100 Use https for Vcs-* fields. diff --git a/debian/changelog b/debian/changelog index 5a142bb..f00d9a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ xserver-xorg-video-amdgpu (1.0.0-1) UNRELEASED; urgency=medium graphics. * Remove unused libpciaccess-dev build-dep. * Update list of supported chips. + * Use https for Vcs-* fields. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 19 Nov 2015 12:08:49 +0100 diff --git a/debian/control b/debian/control index fe0c3db..7546424 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,8 @@ Build-Depends: xserver-xorg-dev (>= 2:1.16), xutils-dev (>= 1:7.5+4) Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-xorg/xserver-xorg-video-amdgpu.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/xserver-xorg-video-amdgpu.git +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 Package: xserver-xorg-video-amdgpu Architecture: linux-any commit ac0d4d325e7816d1db3ba75eef5519c49e700a0d Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Nov 19 12:53:52 2015 +0100 Update list of supported chips. diff --git a/debian/changelog b/debian/changelog index 896d1f2..5a142bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xserver-xorg-video-amdgpu (1.0.0-1) UNRELEASED; urgency=medium * Replace non-existing Suggests: linux-firmware with new firmware-amd- graphics. * Remove unused libpciaccess-dev build-dep. + * Update list of supported chips. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 19 Nov 2015 12:08:49 +0100 diff --git a/debian/control b/debian/control index 13fdb41..fe0c3db 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Suggests: firmware-amd-graphics Description: X.Org X server -- AMDGPU display driver This package provides the 'amdgpu' driver for the AMD Radeon cards. The following chip families should be supported: Bonaire, Hawaii, Kaveri, Kabini - Mullins, Iceland, Tonga, Carrizo. + Mullins, Iceland, Tonga, Carrizo, Fiji, Stoney. . More information about X.Org can be found at: <URL:http://www.X.org> @@ -54,7 +54,7 @@ Priority: extra Description: X.Org X server -- AMDGPU display driver (debugging symbols) This package provides the 'amdgpu' driver for the AMD Radeon cards. The following chip families should be supported: Bonaire, Hawaii, Kaveri, Kabini - Mullins, Iceland, Tonga, Carrizo. + Mullins, Iceland, Tonga, Carrizo, Fiji, Stoney. . This package provides debugging symbols for this X.org X driver. commit 3dfa315383e3ab4658eabc143e4f02c72aa12c41 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Nov 19 12:44:51 2015 +0100 Remove unused libpciaccess-dev build-dep. diff --git a/debian/changelog b/debian/changelog index 17112b7..896d1f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xserver-xorg-video-amdgpu (1.0.0-1) UNRELEASED; urgency=medium * Let uscan verify tarball signatures. * Replace non-existing Suggests: linux-firmware with new firmware-amd- graphics. + * Remove unused libpciaccess-dev build-dep. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 19 Nov 2015 12:08:49 +0100 diff --git a/debian/control b/debian/control index 270e68e..13fdb41 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Build-Depends: libdrm-dev (>= 2.4.63) [!hurd-i386], libgl1-mesa-dev | libgl-dev, libgbm-dev, - libpciaccess-dev, libudev-dev [linux-any], pkg-config, x11proto-core-dev, commit 7fb5f680272d9683532d0684126ea7ac90fa6a18 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Nov 19 12:42:09 2015 +0100 Replace non-existing Suggests: linux-firmware with new firmware-amd-graphics. diff --git a/debian/changelog b/debian/changelog index ea9e6e4..17112b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ xserver-xorg-video-amdgpu (1.0.0-1) UNRELEASED; urgency=medium * First upstream release. * Let uscan verify tarball signatures. + * Replace non-existing Suggests: linux-firmware with new firmware-amd- + graphics. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 19 Nov 2015 12:08:49 +0100 diff --git a/debian/control b/debian/control index 4141251..270e68e 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Depends: ${misc:Depends}, ${xviddriver:Depends}, Provides: ${xviddriver:Provides} -Suggests: linux-firmware +Suggests: firmware-amd-graphics Description: X.Org X server -- AMDGPU display driver This package provides the 'amdgpu' driver for the AMD Radeon cards. The following chip families should be supported: Bonaire, Hawaii, Kaveri, Kabini commit 88441f6b18a3877400a2e943c9b787a4012919a3 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Nov 19 12:17:11 2015 +0100 Mention upstream git URL in a comment. diff --git a/debian/watch b/debian/watch index 70636ae..e04f0c3 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-amdgpu version=3 opts=pgpsigurlmangle=s/$/.sig/ \ http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-amdgpu-(.*)\.tar\.gz commit 394cf19d56031829b5ccd12dfdbbe6fe765b253e Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Nov 19 12:16:12 2015 +0100 Let uscan verify tarball signatures. diff --git a/debian/changelog b/debian/changelog index e213b9f..ea9e6e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-amdgpu (1.0.0-1) UNRELEASED; urgency=medium * First upstream release. + * Let uscan verify tarball signatures. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 19 Nov 2015 12:08:49 +0100 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..82eaa8a --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,26 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBDsehS8RBACbsIQEX31aYSIuEKxEnEX82ezMR8z3LG8ktv1KjyNErUX9Pt7A +UC7W3W0bLUhu8Le8S2va6hi7GfSAifl0ih3k6Bv1Itzgnd+7ZmSrvCN8yGJaHNQf +AevAuEboIb+MaVHo9EMJj4ikOcRZCmQWw7evu/D9uQdtkCnRY9iJiAGxbwCguBHt +poGMxDOINCr5UU6qt+m4O+UD/355ohBBzzyh49lTj0kTFKr0Ozd20G2FbcqHgfFL +1dc1MPyigej2gLga2osu2QY0ObvAGkOuWBi3LTY8Zs8uqFGDC4ZAwMPoFy3yzu3n +e6T7d/68rJil0QcdQjzzHi6ekqHuhst4a+/+D23hZa8MJBEcdOhRhsaDVGAJSFEQ +B1qLBACOs0xN+XblejO35gsDSVVk8s+FUUw3TSWJBfZa3ImpV2U2tBO4qck+wqbH +NfdnU/crrsHahjzBjvk8Up7VoY8oT+z03sal2vXEonS279xN2B92TttrAgwosujg +uFO/7tvzymWC76rDEwue8TsADE11ErjwaBTs8ZXfnN/uAANgPLQjTWljaGVsIERh +ZW56ZXIgPGRhZW56ZXJAZGViaWFuLm9yZz6IXwQTEQIAFwUCOx6FMAULBwoDBAMV +AwIDFgIBAheAABIJEFqBr45q27IAB2VHUEcAAQFmmQCfSxXBxMctJqTLwn2Ijv5V +JYbUWK8AmQGwoAUEMLmo8Ceu/NJDgkkS92xttCNNaWNoZWwgRGFlbnplciA8bWlj +aGVsQGRhZW56ZXIubmV0PohmBBMRAgAeBQJAVfEmAhsDBgsJCAcDAgMVAgMDFgIB +Ah4BAheAABIJEFqBr45q27IAB2VHUEcAAQGKzwCfcpKJ1yN6EHF/NzdqswhErSzV +uO4Ani1pv0Ij2I6rRlJ50m8rk0HyMkpCuQENBDsehUUQBACWZHL5JT8CQoDYsN+6 +dBkoSphRhqn/2t8WWRKYyKjcc7IRURZ3mc3uH+S4c219f7yJufmV7BFspqSX2c8g +pmD8POkHBccmX5ZAMR8fS3g/vPRJcW8OsE9AnC70r/ETn1NZvGIRm1eoNs1siw9P +52kBlW/HuBYVShjWNhBGx4BQawADBgP9FZLRTgsRQXcy0Ne0Qk8Aid8acj+KrCyR +9MgqANuqx9sxNkcwcoa0xU2Gc2xRInd3XRohzgRC/mzvthjbX4mCpm05I9bTGSfC ++obijjWlawEhcy72WtnZXNs42vWUpLCpoHuQTkyloG8nqRHOasUo7mLGK1+cXy4E +2QuWm4Yc7aWITgQYEQIABgUCOx6FRQASCRBaga+OatuyAAdlR1BHAAEBlscAn2Uf +k2d6/3p4Cuyz/NX7KpL2dQ8WAJ9UD5JEakhfofed8PSqOM7jOO3LCA== +=P0UI +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 28921d5..70636ae 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 +opts=pgpsigurlmangle=s/$/.sig/ \ http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-amdgpu-(.*)\.tar\.gz commit 295d5435c0b415013ea4bff058654a2327ac904b Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Nov 19 12:10:14 2015 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..d0869e5 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,1459 @@ +commit 755e6ff2337cf615e3ba0854ccd533baec7144db +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Nov 19 17:28:19 2015 +0900 + + Bump version for 1.0.0 release + +commit 49c7d2be99aaf6d040e553065bdc461ce8d4769a +Author: Michel Dänzer <michel.daen...@amd.com> +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 <cp...@redhat.com> +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 <cp...@redhat.com> + (ported from radeon commit 7186a8713ba004de4991f21c1a9fc4abc62aeff4) + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit c8bddcf6c97b1338be3715f1fc5e0b17ce71c195 +Author: Michel Dänzer <michel.daen...@amd.com> +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 <alexander.deuc...@amd.com> + +commit 12815156f38ce3357f03901a78402db834577d11 +Author: Emil Velikov <emil.l.veli...@gmail.com> +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 <emil.l.veli...@gmail.com> + (ported from radeon commit fcb32231a38f9461d12720cbf72f63502197a711) + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit a02982b0ae0b79d2f183a1628edc05cafed8703a +Author: Michel Dänzer <michel.daen...@amd.com> +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 <alexander.deuc...@amd.com> + +commit 0ddd20600d0046afd17aa47ffebe86dfd91a2215 +Author: Michel Dänzer <michel.daen...@amd.com> +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. + + (ported from radeon commit c9f8f642fd495937400618a4fc25ecae3f8888fc) + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 83a47c0ebe17caa79d12a8b2f94b59cc945452f5 +Author: Michel Dänzer <michel.daen...@amd.com> +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 <alexander.deuc...@amd.com> + +commit 560b7fe6dc66405762020f00e9a05918a36f3a17 +Author: Michel Dänzer <michel.daen...@amd.com> +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 <alexander.deuc...@amd.com> + +commit ad77ad32c4a723447d3191d527cfa6de9f54d7ce +Author: Adam Jackson <a...@redhat.com> +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 <a...@redhat.com> + (ported from radeon commit 851b2cf8714618843725f6d067915375485ade9d) + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit f5ccea99c03b62acf3a25984aba617c665d80b7c +Author: Michel Dänzer <michel.daen...@amd.com> +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 <alexander.deuc...@amd.com> + +commit 92e7c93d2f9c3036da1a17d7fccccb6f9e9eaa3d +Author: Michel Dänzer <michel.daen...@amd.com> +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 <jammy.z...@amd.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit c9bd1399a13cea2e1331af2c826ca054b88db071 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Mon Nov 2 18:21:50 2015 +0900 + + Call AMDGPUFreeRec from AMDGPUFreeScreen_KMS even if info == NULL + + It's safe now. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit fb8444e731765588c0ff1e9053c1c7b73f5f0907 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Mon Nov 2 18:20:41 2015 +0900 + + Don't use AMDGPUEntPriv in AMDGPUFreeRec + + It crashes if info == NULL. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 8e7ee03f55c2f3874f6e84daeb5700f8b8037a51 +Author: Michel Dänzer <michel.daen...@amd.com> +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 <jammy.z...@amd.com> + +commit 6bab8fabb37eb131e131ce59446c214ded28f779 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Oct 28 17:44:09 2015 +0900 + + Remove info->dri2.drm_fd and info->drmmode->fd + + Use pAMDGPUEnt->fd everywhere instead. + + Reviewed-by: Jammy Zhou <jammy.z...@amd.com> + +commit 0530e39cc6b7340163e7f6bb6d82719d102ee6e9 +Author: Jammy Zhou <jammy.z...@amd.com> +Date: Thu Oct 29 17:08:01 2015 +0900 + + Pass struct pci_device *pci_dev directly to amdgpu_get_scrninfo + + Instead of throwing away the type information by passing it as a void*. + + Signed-off-by: Michel Dänzer <michel.daen...@amd.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit edf72afee3a25eae9827b4de3a013b541b78e213 +Author: Jammy Zhou <jammy.z...@amd.com> +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 <jammy.z...@amd.com> + Signed-off-by: Michel Dänzer <michel.daen...@amd.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> (v3) + +commit cef725121eb0e56aa54d9c4665e36047373f4db7 +Author: Michel Dänzer <michel.daen...@amd.com> +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 <jammy.z...@amd.com> + +commit 3b0a3c89b53b3ebe21a9d703a4dbff6e57c65a57 +Author: Samuel Li <samuel...@amd.com> +Date: Thu Oct 22 12:50:21 2015 -0400 + + Add Stoney support + + (agd): rebase + + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + Signed-off-by: Samuel Li <samuel...@amd.com> + +commit 9c8b7ebe15eec7abd5dc10ad6ccecbc57225494a +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Wed Oct 21 17:18:44 2015 +0900 + + Revert "Handle RandR CRTC transforms properly" + + This reverts commit 175251645fec1a3d19f498e1cd1e655374c67801. + + I accidentally pushed this patch. + +commit 0a6ba4bf50128464a30951721b0c72e748fb89bc +Author: Darren Powell <darren.pow...@amd.com> +Date: Tue Oct 20 16:56:54 2015 -0400 + + Add Option "TearFree" to manpage + + This was missed in commit c57da33308a81fa575179238a0415abcb8b34908. + + Signed-off-by: Darren Powell <darren.pow...@amd.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 175251645fec1a3d19f498e1cd1e655374c67801 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Thu Oct 15 16:35:51 2015 +0900 + + Handle RandR CRTC transforms properly + +commit 6000aef4e2f0a121b94023484406fb6f04688f74 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + +commit 21e72fb2418b5cc7fc849a9cf951186e209036b0 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Fri Oct 9 18:38:47 2015 +0900 + + Properly handle drmModeAddFB failure in drmmode_crtc_scanout_allocate + + We were printing an error message, but not propagating the failure. That + would probably lead to trouble down the road. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 8da1d0c870e1081d77925807d6e3bbc61a23f54f +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Fri Oct 9 18:59:16 2015 +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. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit dc40582d5ff94d812cbc08f95cf14b80cd0f410d +Author: Michel Dänzer <michel.daen...@amd.com> +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 <alexander.deuc...@amd.com> + +commit 460560502a1bdf26d06f3c30df46fa9f28ffb9e5 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 56398d6651dfc4935cbd117ad861e1800077c73c +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 4b92b960c7705be8b3a5dee17b2341864d7ca9bb +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit fe100fd6bf483228eaf64b959c56a68e8dac4447 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit bfa925a04815cee5fd57b99447cb2ee0e158036c +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit a1e47e76322619ed037ebce27974a4e3792940c2 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit bac21dfc8e60a07f08158b13fab1f3a9b9d27d1b +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit a5f7f2e68bad1935f5ad52286033237467f77302 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit e14e3560bff2537d3ad4c93d2b31442a122cde66 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + + [ Michel Dänzer: fix up slightly to better match radeon formatting ] + + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit e9621ec0e2400f62db320c560a739b29258edb87 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit db3bb2061b9ac16b0922d9afae99874820356a04 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 94caf7ac777134b8396aa762a506053179bbb4c6 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit f035faec041cb5df65c78effa58eb50197cedf88 +Author: Tom St Denis <tom.stde...@amd.com> +Date: Thu Oct 1 12:56:05 2015 -0400 + + add support for DP 1.2 display hotplug + + Based on radeon commit 2f11dcd43966cf2ee26e61960fd72e6644f5e037 + + > This allows for dynamic creation of conneectors when the + > kernel tells us. + > + > v2: fix dpms off crash + + Signed-off-by: Tom St Denis <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit aee72b29210d79dbf41bde6eef16d7fe817e6cf4 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 0846abeace649d27a5f2c17373e717f92d246797 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 4ca8f957e0b417b099f625470db98a54531a731d +Author: Tom St Denis <tom.stde...@amd.com> +Date: Thu Oct 1 13:16:15 2015 -0400 + + Silence type mismatch warning. + + Signed-off-by: Tom St Denis <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit a79735ab1499c1f7814036d1b19ff465705c5f45 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + + [ 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 <michel.daen...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit b93934a9ed5e92f3a6eac6554c5c4fa2967a6dd0 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit f5c3fd0b57cf9e392bf591110568637937a1d338 +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 3055724aef76a624718f26d5f0f9e9d567ffbcfb +Author: Tom St Denis <tom.stde...@amd.com> +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 <tom.stde...@amd.com> + Reviewed-by: Michel Dänzer <michel.daen...@amd.com> + +commit 9945b4ae1664ab815b39ff07e7b66cfa7f942dfa +Author: Tom St Denis <tom.stde...@amd.com> +Date: Wed Sep 9 09:38:02 2015 -0400 + + Avoid use-after-free in drmmode_output_destroy() + + The encoders array is freed before potentially all of the elements of + the array are individually freed. + + Signed-off-by: Tom St Denis <tom.stde...@amd.com> + Reviewed-by: Christian König <christian.koe...@amd.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + Signed-off-by: Michel Dänzer <michel.daen...@amd.com> (cosmetic fixups) + +commit 36b3faebdd1d2090a286616eeeb131d15e9a1386 +Author: Tom St Denis <tom.stde...@amd.com> +Date: Wed Sep 9 09:36:59 2015 -0400 + + Avoid use-after-free in amdgpu_kernel_open_fd() + + If the device cannot be opened avoid re-using busid after it has been + freed. + + Signed-off-by: Tom St Denis <tom.stde...@amd.com> + Reviewed-by: Christian König <christian.koe...@amd.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + Signed-off-by: Michel Dänzer <michel.daen...@amd.com> (cosmetic fixups) + +commit 8823c3d4c6db70cff7699b31088f2d92db8faaf4 +Author: Tom St Denis <tom.stde...@amd.com> +Date: Wed Sep 9 09:34:38 2015 -0400 + + dri2: Avoid calculation with undefined msc value + + If the get_msc() call fails for any reason we should avoid updating the + vblank counter delta with undefined data. + + Signed-off-by: Tom St Denis <tom.stde...@amd.com> + Reviewed-by: Christian König <christian.koe...@amd.com> + Acked-by: Alex Deucher <alexander.deuc...@amd.com> + Signed-off-by: Michel Dänzer <michel.daen...@amd.com> (minor fixups) + +commit 63948ea091a9b324327ade7ec4fc5d67ca7e6f6f +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Fri Aug 14 18:41:57 2015 +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. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66384 + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 55a4461bd95698cb8d52f9f6c28583f8f81afb4e +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Fri Aug 7 11:46:31 2015 +0900 + + Wait for scanout BO initialization to finish before setting mode + + 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. + + (Ported from radeon commit 3791fceabf2cb037467dc41c15364e9f9ec1e47e) + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit 4c425e9c5c038504a0f0498dd800ab1fb40bf0c5 +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Fri Aug 7 12:39:24 2015 +0900 + + glamor: Add amdgpu_glamor_finish to wait for glamor rendering to finish + + This is a bit sneaky, because it calls glFinish directly from the driver, + but it seems to work fine. + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit bb989e173dc364a7d68e50d7e819d0e0ee133d2f +Author: Michel Dänzer <michel.daen...@amd.com> +Date: Fri Aug 7 11:43:48 2015 +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. + + (Ported from radeon commit 4e3dfa69e4630df2e0ec0f5b81d61159757c4664) + + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> + +commit ebe2c020fbf2ef8de01fc50b201ab23ddb9fb13b +Author: Mario Kleiner <mario.kleiner...@gmail.com> +Date: Mon Aug 10 23:34:40 2015 +0200 + + Make selection between DRI2 and DRI3 consistent with other drivers. (v2) + + Add Option "DRI" to allow selection of maximum DRI level. + + 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. + + v2: Retain handling of old Option "DRI3" for backwards