xf86-video-amdgpu: Branch 'master' - 2 commits
Michel Dänzer
daenzer at kemper.freedesktop.org
Wed Apr 18 10:03:17 UTC 2018
configure.ac | 2 +-
src/drmmode_display.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 9f6a8905611b5b1d8fcd31bebbc9af7ca1355cc3
Author: Jim Qu <Jim.Qu at amd.com>
Date: Tue Apr 17 19:11:16 2018 +0800
Wait for pending scanout update before calling drmmode_crtc_scanout_free
There is a case that when set screen from reverse to normal, the old
scanout damage is freed in modesetting before scanout update handler,
so it causes segment fault issue.
Signed-off-by: Jim Qu <Jim.Qu at amd.com>
[ Michel Dänzer: Only call drmmode_crtc_wait_pending_event before
drmmode_crtc_scanout_free is actually called, slightly tweak commit
message ]
Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 85970d1..2d1540d 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -952,9 +952,11 @@ done:
if (drmmode_crtc->scanout[scanout_id].pixmap &&
fb != amdgpu_pixmap_get_fb(drmmode_crtc->
- scanout[scanout_id].pixmap))
+ scanout[scanout_id].pixmap)) {
+ drmmode_crtc_wait_pending_event(drmmode_crtc, pAMDGPUEnt->fd,
+ drmmode_crtc->scanout_update_pending);
drmmode_crtc_scanout_free(drmmode_crtc);
- else if (!drmmode_crtc->tear_free) {
+ } else if (!drmmode_crtc->tear_free) {
drmmode_crtc_scanout_destroy(drmmode,
&drmmode_crtc->scanout[1]);
}
commit c6f1559eba551a5a3bf374c7e7e875928f3b138d
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Wed Apr 18 10:41:46 2018 +0200
Post-release version bump
diff --git a/configure.ac b/configure.ac
index 7b7a4b1..2593f52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-amdgpu],
- [18.0.1],
+ [18.0.99],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/AMDgpu],
[xf86-video-amdgpu])
More information about the xorg-commit
mailing list