xf86-video-amdgpu: Branch 'master' - 2 commits
Michel Dänzer
daenzer at kemper.freedesktop.org
Mon Apr 11 07:35:07 UTC 2016
configure.ac | 2 +-
src/amdgpu_kms.c | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit a0bbb373f902e0ffc14570c85faec7e44134f62e
Author: Qiang Yu <Qiang.Yu at amd.com>
Date: Fri Apr 8 17:29:17 2016 +0800
Remove RR_Capability_SinkOutput for GPU without CRTC.
Signed-off-by: Qiang Yu <Qiang.Yu at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index ae98cf1..125cb77 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -758,8 +758,11 @@ static void AMDGPUSetupCapabilities(ScrnInfoPtr pScrn)
if (ret == 0) {
if (value & DRM_PRIME_CAP_EXPORT)
pScrn->capabilities |= RR_Capability_SourceOutput | RR_Capability_SinkOffload;
- if (value & DRM_PRIME_CAP_IMPORT)
- pScrn->capabilities |= RR_Capability_SinkOutput | RR_Capability_SourceOffload;
+ if (value & DRM_PRIME_CAP_IMPORT) {
+ pScrn->capabilities |= RR_Capability_SourceOffload;
+ if (info->drmmode.count_crtcs)
+ pScrn->capabilities |= RR_Capability_SinkOutput;
+ }
}
#endif
}
@@ -873,8 +876,6 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags)
amdgpu_drm_queue_init();
- AMDGPUSetupCapabilities(pScrn);
-
/* don't enable tiling if accel is not enabled */
if (info->use_glamor) {
/* set default group bytes, overridden by kernel info below */
@@ -928,6 +929,8 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags)
goto fail;
}
+ AMDGPUSetupCapabilities(pScrn);
+
if (info->drmmode.count_crtcs == 1)
pAMDGPUEnt->HasCRTC2 = FALSE;
else
commit 1a29c4bcc0a286b14f37ab942eb0cad47bc4f337
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Mon Apr 11 16:27:40 2016 +0900
Post 1.1.0 release version bump
diff --git a/configure.ac b/configure.ac
index 824467d..dd5905f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-amdgpu],
- [1.1.0],
+ [1.1.99],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-amdgpu])
More information about the xorg-commit
mailing list