xf86-video-amdgpu: Branch 'master'

[GitLab Mirror]

 src/amdgpu_kms.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 87f41ace4920fd2069794211683659eb25b025a6
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Jul 5 12:43:53 2019 +0200

    Don't disable page flipping completely with SW cursor
    
    Even with SW cursor, page flipping can be used while no X cursor is
    visible.
    
    Occurred to me in the context of xorg/xserver#828.

diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 74d5806..3280972 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -1537,7 +1537,6 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 	int cpp;
 	uint64_t heap_size = 0;
 	uint64_t max_allocation = 0;
-	Bool sw_cursor;
 
 	if (flags & PROBE_DETECT)
 		return TRUE;
@@ -1645,19 +1644,15 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 	}
 
 	if (!pScrn->is_gpu) {
-		sw_cursor = xf86ReturnOptValBool(info->Options,
-						 OPTION_SW_CURSOR, FALSE);
-
 		info->allowPageFlip = xf86ReturnOptValBool(info->Options,
 							   OPTION_PAGE_FLIP,
 							   TRUE);
-		if (sw_cursor || info->shadow_primary) {
+		if (info->shadow_primary) {
 			xf86DrvMsg(pScrn->scrnIndex,
 				   info->allowPageFlip ? X_WARNING : X_DEFAULT,
 				   "KMS Pageflipping: disabled%s\n",
 				   info->allowPageFlip ?
-				   (sw_cursor ? " because of SWcursor" :
-				    " because of ShadowPrimary") : "");
+				   " because of ShadowPrimary" : "");
 			info->allowPageFlip = FALSE;
 		} else {
 			xf86DrvMsg(pScrn->scrnIndex, X_INFO,