mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 20:33:58 -04:00
Merge "msm: kgsl: Check the return value of regulator_enable"
This commit is contained in:
commit
f4913de490
2 changed files with 4 additions and 4 deletions
|
|
@ -1418,6 +1418,9 @@ static int adreno_bind(struct device *dev)
|
|||
if (adreno_is_a6xx(adreno_dev))
|
||||
kgsl_mmu_set_feature(device, KGSL_MMU_SMMU_APERTURE);
|
||||
|
||||
if (ADRENO_FEATURE(adreno_dev, ADRENO_IOCOHERENT))
|
||||
kgsl_mmu_set_feature(device, KGSL_MMU_IO_COHERENT);
|
||||
|
||||
device->pwrctrl.bus_width = adreno_dev->gpucore->bus_width;
|
||||
|
||||
device->mmu.secured = (IS_ENABLED(CONFIG_QCOM_SECURE_BUFFER) &&
|
||||
|
|
@ -1449,9 +1452,6 @@ static int adreno_bind(struct device *dev)
|
|||
|
||||
adreno_isense_probe(device);
|
||||
|
||||
if (ADRENO_FEATURE(adreno_dev, ADRENO_IOCOHERENT))
|
||||
kgsl_mmu_set_feature(device, KGSL_MMU_IO_COHERENT);
|
||||
|
||||
/* Allocate the memstore for storing timestamps and other useful info */
|
||||
|
||||
if (ADRENO_FEATURE(adreno_dev, ADRENO_APRIV))
|
||||
|
|
|
|||
|
|
@ -842,7 +842,7 @@ static void kgsl_iommu_enable_clk(struct kgsl_mmu *mmu)
|
|||
struct kgsl_iommu *iommu = _IOMMU_PRIV(mmu);
|
||||
|
||||
if (!IS_ERR_OR_NULL(iommu->cx_gdsc))
|
||||
regulator_enable(iommu->cx_gdsc);
|
||||
WARN_ON(regulator_enable(iommu->cx_gdsc));
|
||||
|
||||
for (j = 0; j < KGSL_IOMMU_MAX_CLKS; j++) {
|
||||
if (iommu->clks[j])
|
||||
|
|
|
|||
Loading…
Reference in a new issue