evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm: msm: sde: fix incorrect function pointer check"

Browse source
This commit is contained in:
Linux Build Service Account 2018-11-15 22:59:05 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3fcf84534d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/msm/sde/sde_splash.c
View file

@ -354,7 +354,7 @@ static int _sde_splash_free_module_resource(struct msm_mmu *mmu,
if (!msm_obj) if (!msm_obj)
return -EINVAL; return -EINVAL;
if (mmu->funcs && mmu->funcs->unmap) if (mmu->funcs && mmu->funcs->early_splash_unmap)
mmu->funcs->early_splash_unmap(mmu, mmu->funcs->early_splash_unmap(mmu,
sinfo->splash_mem_paddr[i], msm_obj->sgt); sinfo->splash_mem_paddr[i], msm_obj->sgt);
@ -648,7 +648,7 @@ int sde_splash_smmu_map(struct drm_device *dev, struct msm_mmu *mmu,
for (i = 0; i < sinfo->splash_mem_num; i++) { for (i = 0; i < sinfo->splash_mem_num; i++) {
msm_obj = to_msm_bo(sinfo->obj[i]); msm_obj = to_msm_bo(sinfo->obj[i]);
if (mmu->funcs && mmu->funcs->map) { if (mmu->funcs && mmu->funcs->early_splash_map) {
ret = mmu->funcs->early_splash_map(mmu, ret = mmu->funcs->early_splash_map(mmu,
sinfo->splash_mem_paddr[i], msm_obj->sgt, sinfo->splash_mem_paddr[i], msm_obj->sgt,
IOMMU_READ | IOMMU_NOEXEC); IOMMU_READ | IOMMU_NOEXEC);