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

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

Merge "msm: kgsl: Fix miscellaneous compilation errors"

parents 7a031572 e112b1c7

drivers/gpu/msm/adreno.h

+4 −0
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ 
#include "adreno_ringbuffer.h"

#include "adreno_profile.h"

#include "kgsl_iommu.h"

#include <linux/stat.h>



#ifdef CONFIG_MSM_OCMEM

#include <mach/ocmem.h>

#endif



#include "a3xx_reg.h"

drivers/gpu/msm/kgsl_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,7 @@ kgsl_iommu_map(struct kgsl_pagetable *pt, 
				page_to_phys(kgsl_guard_page), PAGE_SIZE,

				protflags & ~IOMMU_WRITE);

		if (ret) {

			KGSL_CORE_ERR("iommu_map(%p, %x, guard, %x) err: %d\n",

			KGSL_CORE_ERR("iommu_map(%p, %zx, guard, %x) err: %d\n",

				iommu_pt->domain, iommu_virt_addr + size,

				protflags & ~IOMMU_WRITE,

				ret);