| msm-next pull request has a baseline with stuff from -fixes, roll forward first. Some simple conflicts in amdgpu, ttm and one in i915 where git gets confused and tries to add the same function twice. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> | ||
|---|---|---|
| .. | ||
| cmdstream.xml.h | ||
| common.xml.h | ||
| etnaviv_buffer.c | ||
| etnaviv_cmd_parser.c | ||
| etnaviv_cmdbuf.c | ||
| etnaviv_cmdbuf.h | ||
| etnaviv_drv.c | ||
| etnaviv_drv.h | ||
| etnaviv_dump.c | ||
| etnaviv_dump.h | ||
| etnaviv_gem_prime.c | ||
| etnaviv_gem_submit.c | ||
| etnaviv_gem.c | ||
| etnaviv_gem.h | ||
| etnaviv_gpu.c | ||
| etnaviv_gpu.h | ||
| etnaviv_hwdb.c | ||
| etnaviv_iommu_v2.c | ||
| etnaviv_iommu.c | ||
| etnaviv_mmu.c | ||
| etnaviv_mmu.h | ||
| etnaviv_perfmon.c | ||
| etnaviv_perfmon.h | ||
| etnaviv_sched.c | ||
| etnaviv_sched.h | ||
| Kconfig | ||
| Makefile | ||
| state_3d.xml.h | ||
| state_blt.xml.h | ||
| state_hi.xml.h | ||
| state.xml.h | ||