xf86-video-ati: Branch 'master'

[GitLab Mirror]

 src/radeon_kms.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit c7ed12cb2ea76999351d7cb87877224bdc0664f0
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Jul 18 18:14:48 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.
    (Ported from amdgpu commit 87f41ace4920fd2069794211683659eb25b025a6)

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index ff4f8dcf..777fc14e 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1917,19 +1917,15 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 
     if (!pScrn->is_gpu) {
 	if (info->dri2.pKernelDRMVersion->version_minor >= 8) {
-	    Bool 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,