A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 04:42:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

msm: kgsl: Enable the CX GSDC before accessing IOMMU registers

Browse source 
If needed, the IOMMU device can define a CX GDSC to enable before
turning on clocks to directly write IOMMU registers.

Change-Id: Ic0dedbadc8479cc36d5603d6d8a2c93133fda668
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
This commit is contained in:
Jordan Crouse 2020-02-27 10:33:28 -07:00
commit 1c6fcc54ec
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@
#include <linux/delay.h>
#include <linux/qcom_scm.h>
#include <linux/random.h>
#include <linux/regulator/consumer.h>
#include <soc/qcom/secure_buffer.h>
#include "adreno.h"
@ -762,6 +763,9 @@ static void kgsl_iommu_disable_clk(struct kgsl_mmu *mmu)
for (j = (KGSL_IOMMU_MAX_CLKS - 1); j >= 0; j--)
if (iommu->clks[j])
clk_disable_unprepare(iommu->clks[j]);
if (!IS_ERR_OR_NULL(iommu->cx_gdsc))
regulator_disable(iommu->cx_gdsc);
}
/*
@ -789,6 +793,9 @@ static void kgsl_iommu_enable_clk(struct kgsl_mmu *mmu)
int j;
struct kgsl_iommu *iommu = _IOMMU_PRIV(mmu);
if (!IS_ERR_OR_NULL(iommu->cx_gdsc))
regulator_enable(iommu->cx_gdsc);
for (j = 0; j < KGSL_IOMMU_MAX_CLKS; j++) {
if (iommu->clks[j])
kgsl_iommu_clk_prepare_enable(iommu->clks[j]);
@ -2572,6 +2579,9 @@ static int _kgsl_iommu_probe(struct kgsl_device *device,
iommu->clks[index++] = c;
}
/* Get the CX regulator if it is available */
iommu->cx_gdsc = devm_regulator_get(&pdev->dev, "vddcx");
for (i = 0; i < ARRAY_SIZE(kgsl_iommu_features); i++) {
if (of_property_read_bool(node, kgsl_iommu_features[i].feature))
device->mmu.features |= kgsl_iommu_features[i].bit;

2
drivers/gpu/msm/kgsl_iommu.h
View file

@ -131,6 +131,8 @@ struct kgsl_iommu {
u32 cb0_offset;
/** @pagesize: Size of each context bank register space */
u32 pagesize;
/** @cx_gdsc: CX GDSC handle in case the IOMMU needs it */
struct regulator *cx_gdsc;
};
/*