commit e9b97d4bf9b29e652f15de5159aa31413e7b8e97
author Linux Build Service Account <lnxbuild@localhost> Sat Mar 15 23:57:15 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Mar 15 23:57:15 2014 -0700
tree f596227f5140f49c3a7a878e8f74d2c0caf1c8ac
parent d713ba12be7a6c370942126e9f5396fe00839867
parent e5963ff103436b93b0bc8827fe56b608020fdceb

Merge "msm: kgsl: Treat 0x0 as valid GPU pagetable physical address"

drivers/gpu/msm/kgsl_iommu.c

diff --git a/drivers/gpu/msm/kgsl_iommu.c b/drivers/gpu/msm/kgsl_iommu.c
index e87c670..69b953f 100755
--- a/drivers/gpu/msm/kgsl_iommu.c
+++ b/drivers/gpu/msm/kgsl_iommu.c
@@ -641,16 +641,18 @@
 				phys_addr_t pt_base)
 {
 	struct kgsl_iommu_pt *iommu_pt = pt ? pt->priv : NULL;
-	phys_addr_t domain_ptbase = iommu_pt ?
-				iommu_get_pt_base_addr(iommu_pt->domain) : 0;
+	phys_addr_t domain_ptbase;
 
-	/* Only compare the valid address bits of the pt_base */
-	domain_ptbase &= KGSL_IOMMU_CTX_TTBR0_ADDR_MASK;
+	if (iommu_pt == NULL)
+		return 0;
+
+	domain_ptbase = iommu_get_pt_base_addr(iommu_pt->domain)
+			& KGSL_IOMMU_CTX_TTBR0_ADDR_MASK;
 
 	pt_base &= KGSL_IOMMU_CTX_TTBR0_ADDR_MASK;
 
-	return domain_ptbase && pt_base &&
-		(domain_ptbase == pt_base);
+	return (domain_ptbase == pt_base);
+
 }
 
 /*