Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 442a734c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I6ba3f336,Iae02d976 into msm-4.14 

* changes:
  msm: kgsl: Log register offset when fenced write fails
  msm: kgsl: Fix input checking when unmapping secure buffer
parents c40c00f5 cc74ee73

drivers/gpu/msm/kgsl_gmu.c

+3 −1
Original line number Diff line number Diff line
@@ -1898,6 +1898,8 @@ int adreno_gmu_fenced_write(struct adreno_device *adreno_dev, 
		unsigned int fence_mask)

{

	unsigned int status, i;

	struct adreno_gpudev *gpudev = ADRENO_GPU_DEVICE(adreno_dev);

	unsigned int reg_offset = gpudev->reg_offsets->offsets[offset];



	adreno_writereg(adreno_dev, offset, val);
@@ -1922,6 +1924,6 @@ int adreno_gmu_fenced_write(struct adreno_device *adreno_dev, 
	}



	dev_err(adreno_dev->dev.dev,

		"GMU fenced register write timed out: reg %x\n", offset);

		"GMU fenced register write timed out: reg 0x%x\n", reg_offset);

	return -ETIMEDOUT;

}

drivers/gpu/msm/kgsl_iommu.c

+9 −4
Original line number Diff line number Diff line
@@ -165,14 +165,19 @@ static int kgsl_iommu_map_globals(struct kgsl_pagetable *pagetable) 
}



void kgsl_iommu_unmap_global_secure_pt_entry(struct kgsl_device *device,

				struct kgsl_memdesc *entry)

				struct kgsl_memdesc *memdesc)

{

	if (!kgsl_mmu_is_secured(&device->mmu))

	if (!kgsl_mmu_is_secured(&device->mmu) || memdesc == NULL)

		return;



	if (entry != NULL && entry->pagetable->name == KGSL_MMU_SECURE_PT)

		kgsl_mmu_unmap(entry->pagetable, entry);

	/* Check if an empty memdesc got passed in */

	if ((memdesc->gpuaddr == 0) || (memdesc->size == 0))

		return;



	if (memdesc->pagetable) {

		if (memdesc->pagetable->name == KGSL_MMU_SECURE_PT)

			kgsl_mmu_unmap(memdesc->pagetable, memdesc);

	}

}



int kgsl_iommu_map_global_secure_pt_entry(struct kgsl_device *device,