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

Commit 790737d6 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Program sub-cache ID for SC8180"

parents 451e69f1 11245d7e

drivers/gpu/msm/adreno_a6xx.c

+3 −3
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ static void a6xx_llc_configure_gpu_scid(struct adreno_device *adreno_dev) 
			| gpu_scid;



	if (adreno_is_a640(adreno_dev) || adreno_is_a612(adreno_dev) ||

		adreno_is_a610(adreno_dev)) {

		adreno_is_a610(adreno_dev) || adreno_is_a680(adreno_dev)) {

		kgsl_regrmw(KGSL_DEVICE(adreno_dev), A6XX_GBIF_SCACHE_CNTL1,

			A6XX_GPU_LLC_SCID_MASK, gpu_cntl1_val);

	} else {
@@ -1663,7 +1663,7 @@ static void a6xx_llc_configure_gpuhtw_scid(struct adreno_device *adreno_dev) 
	 * XBL image.

	 */

	if (adreno_is_a640(adreno_dev) || adreno_is_a612(adreno_dev) ||

		adreno_is_a610(adreno_dev))

		adreno_is_a610(adreno_dev) || adreno_is_a680(adreno_dev))

		return;



	gpuhtw_scid = adreno_llc_get_scid(adreno_dev->gpuhtw_llc_slice);
@@ -1685,7 +1685,7 @@ static void a6xx_llc_enable_overrides(struct adreno_device *adreno_dev) 
	 * Attributes are used as configured through SMMU pagetable entries.

	 */

	if (adreno_is_a640(adreno_dev) || adreno_is_a612(adreno_dev) ||

		adreno_is_a610(adreno_dev))

		adreno_is_a610(adreno_dev) || adreno_is_a680(adreno_dev))

		return;



	/*

drivers/gpu/msm/kgsl_iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,8 @@ void _enable_gpuhtw_llc(struct kgsl_mmu *mmu, struct kgsl_iommu_pt *iommu_pt) 
		return;



	/* Domain attribute to enable system cache for GPU pagetable walks */

	if (adreno_is_a640(adreno_dev) || adreno_is_a612(adreno_dev))

	if (adreno_is_a640(adreno_dev) || adreno_is_a612(adreno_dev) ||

			adreno_is_a680(adreno_dev))

		ret = iommu_domain_set_attr(iommu_pt->domain,

			DOMAIN_ATTR_USE_LLC_NWA, &gpuhtw_llc_enable);

	else