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

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

Merge "msm: kgsl: Set iommu upstream hint flag only if LLCC is enabled"

parents 6e14fe10 9698e676

drivers/gpu/msm/kgsl_iommu.c

+8 −4
Original line number Diff line number Diff line
@@ -1780,15 +1780,19 @@ static unsigned int _get_protection_flags(struct kgsl_pagetable *pt, 
{

	unsigned int flags = IOMMU_READ | IOMMU_WRITE |

		IOMMU_NOEXEC;

	int ret, llc_nwa = 0;

	int ret, llc_nwa = 0, upstream_hint = 0;

	struct kgsl_iommu_pt *iommu_pt = pt->priv;



	ret = iommu_domain_get_attr(iommu_pt->domain,

				DOMAIN_ATTR_USE_LLC_NWA, &llc_nwa);

				DOMAIN_ATTR_USE_UPSTREAM_HINT, &upstream_hint);



	if (ret || (llc_nwa == 0))

	if (!ret && upstream_hint)

		flags |= IOMMU_USE_UPSTREAM_HINT;

	else



	ret = iommu_domain_get_attr(iommu_pt->domain,

				DOMAIN_ATTR_USE_LLC_NWA, &llc_nwa);



	if (!ret && llc_nwa)

		flags |= IOMMU_USE_LLC_NWA;



	if (memdesc->flags & KGSL_MEMFLAGS_GPUREADONLY)