xf86-video-amdgpu: Branch 'master' - 2 commits

[Michel Dänzer]

 src/amdgpu_kms.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 37c7260bdef3a53b0f0295a531f33938e9aad8cf
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Feb 14 19:06:33 2018 +0100

    If glamor is too old for depth 30, fall back to ShadowFB
    
    Instead of not starting up at all.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 15adb29..e1aae99 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -1083,14 +1083,7 @@ static Bool AMDGPUPreInitVisual(ScrnInfoPtr pScrn)
 	case 15:
 	case 16:
 	case 24:
-		break;
-
 	case 30:
-		if (xorgGetVersion() < XORG_VERSION_NUMERIC(1,19,99,1,0)) {
-			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-				   "Depth 30 requires Xorg >= 1.19.99.1\n");
-			return FALSE;
-		}
 		break;
 
 	default:
@@ -1173,6 +1166,14 @@ static Bool AMDGPUPreInitAccel_KMS(ScrnInfoPtr pScrn)
 			use_glamor = FALSE;
 #endif
 
+		if (pScrn->depth == 30 && use_glamor &&
+		    xorgGetVersion() < XORG_VERSION_NUMERIC(1,19,99,1,0)) {
+			xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+				   "Depth 30 is not supported by GLAMOR with "
+				   "Xorg < 1.19.99.1\n");
+			goto shadowfb;
+		}
+
 #ifdef DRI2
 		info->dri2.available = ! !xf86LoadSubModule(pScrn, "dri2");
 #endif
@@ -1190,6 +1191,7 @@ static Bool AMDGPUPreInitAccel_KMS(ScrnInfoPtr pScrn)
 				   "ShadowFB\n");
 		}
 	} else {
+shadowfb:
 		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
 			   "GPU acceleration disabled, using ShadowFB\n");
 	}
commit 63b0c73a99fdf0eb7550a88df3a0052ce784e758
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Feb 14 18:50:18 2018 +0100

    Revert "Guard against pAMDGPUEnt == NULL in AMDGPUFreeRec"
    
    This reverts commit a23d1ff700d486138c624c2023d8d251c73709af.
    
    pAMDGPUEnt cannot be NULL anymore here now that we no longer call
    AMDGPUFreeRec directly from AMDGPUPreInit_KMS.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index f5874d3..15adb29 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -137,7 +137,7 @@ static void AMDGPUFreeRec(ScrnInfoPtr pScrn)
 
 	pPriv = xf86GetEntityPrivate(pEnt->index, gAMDGPUEntityIndex);
 	pAMDGPUEnt = pPriv->ptr;
-	if (pAMDGPUEnt && pAMDGPUEnt->fd > 0) {
+	if (pAMDGPUEnt->fd > 0) {
 		DevUnion *pPriv;
 		AMDGPUEntPtr pAMDGPUEnt;
 		pPriv = xf86GetEntityPrivate(pScrn->entityList[0],