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

Merge "msm: kgsl: Remove BUG_ON from the map global"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-09 12:42:34 -08:00 • committed by Gerrit - the friendly Code Review server
commit a999a488bf
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/gpu/msm/kgsl_iommu.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -134,7 +134,7 @@ static void kgsl_iommu_unmap_globals(struct kgsl_pagetable *pagetable)
} }
} }
static void kgsl_iommu_map_globals(struct kgsl_pagetable *pagetable) static int kgsl_iommu_map_globals(struct kgsl_pagetable *pagetable)
{ {
unsigned int i; unsigned int i;
@ -143,9 +143,11 @@ static void kgsl_iommu_map_globals(struct kgsl_pagetable *pagetable)
int ret = kgsl_mmu_map(pagetable, int ret = kgsl_mmu_map(pagetable,
global_pt_entries[i].memdesc); global_pt_entries[i].memdesc);
BUG_ON(ret); if (ret)
return ret;
} }
} }
return 0;
} }
static void kgsl_iommu_unmap_global_secure_pt_entry(struct kgsl_pagetable static void kgsl_iommu_unmap_global_secure_pt_entry(struct kgsl_pagetable
@ -158,16 +160,16 @@ static void kgsl_iommu_unmap_global_secure_pt_entry(struct kgsl_pagetable
} }
static void kgsl_map_global_secure_pt_entry(struct kgsl_pagetable *pagetable) static int kgsl_map_global_secure_pt_entry(struct kgsl_pagetable *pagetable)
{ {
int ret; int ret = 0;
struct kgsl_memdesc *entry = kgsl_global_secure_pt_entry; struct kgsl_memdesc *entry = kgsl_global_secure_pt_entry;
if (entry != NULL) { if (entry != NULL) {
entry->pagetable = pagetable; entry->pagetable = pagetable;
ret = kgsl_mmu_map(pagetable, entry); ret = kgsl_mmu_map(pagetable, entry);
BUG_ON(ret);
} }
return ret;
} }
static void kgsl_iommu_remove_global(struct kgsl_mmu *mmu, static void kgsl_iommu_remove_global(struct kgsl_mmu *mmu,
@ -1171,7 +1173,7 @@ static int _init_global_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt)
goto done; goto done;
} }
kgsl_iommu_map_globals(pt); ret = kgsl_iommu_map_globals(pt);
done: done:
if (ret) if (ret)
@ -1227,7 +1229,7 @@ static int _init_secure_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt)
ctx->regbase = iommu->regbase + KGSL_IOMMU_CB0_OFFSET ctx->regbase = iommu->regbase + KGSL_IOMMU_CB0_OFFSET
+ (cb_num << KGSL_IOMMU_CB_SHIFT); + (cb_num << KGSL_IOMMU_CB_SHIFT);
kgsl_map_global_secure_pt_entry(pt); ret = kgsl_map_global_secure_pt_entry(pt);
done: done:
if (ret) if (ret)
@ -1288,7 +1290,7 @@ static int _init_per_process_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt)
goto done; goto done;
} }
kgsl_iommu_map_globals(pt); ret = kgsl_iommu_map_globals(pt);
done: done:
if (ret) if (ret)