[PATCH xf86-video-amdgpu] Revert "Guard against pAMDGPUEnt == NULL in AMDGPUFreeRec"

Michel Dänzer michel at daenzer.net
Wed Feb 14 18:08:49 UTC 2018


From: Michel Dänzer <michel.daenzer at amd.com>

This reverts commit a23d1ff700d486138c624c2023d8d251c73709af.

pAMDGPUEnt cannot be NULL anymore here now that we no longer call
AMDGPUFreeRec directly from AMDGPUPreInit_KMS.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 src/amdgpu_kms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index f5874d3af..15adb2938 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],
-- 
2.16.1



More information about the amd-gfx mailing list