From 48915f6884c2aeaa6426065f7c2a206a2e840250 Mon Sep 17 00:00:00 2001 From: Rohan Sethi Date: Sat, 14 Nov 2020 01:06:13 +0530 Subject: [PATCH] msm: kgsl: Disable gpu_llc flags by default Fixes inconsistency in previous change. Change-Id: I793532e648a8c6f5db5f3bf899d56b3517e55897 Fixes: 4cc996042993 ("msm: kgsl: Disable gpu_llc flags by default") Signed-off-by: Rohan Sethi --- drivers/gpu/msm/adreno.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c index bbd27386a891..a542f8e64287 100644 --- a/drivers/gpu/msm/adreno.c +++ b/drivers/gpu/msm/adreno.c @@ -1219,6 +1219,7 @@ static int adreno_read_speed_bin(struct platform_device *pdev) return val; } +#if IS_ENABLED(CONFIG_QCOM_LLCC) static int adreno_probe_llcc(struct adreno_device *adreno_dev, struct platform_device *pdev) { @@ -1236,9 +1237,8 @@ static int adreno_probe_llcc(struct adreno_device *adreno_dev, if (ret != -ENOENT) dev_warn(&pdev->dev, "Unable to get the GPU LLC slice: %d\n", ret); - } - - adreno_dev->gpu_llc_slice_enable = true; + } else + adreno_dev->gpu_llc_slice_enable = true; /* Get the system cache slice descriptor for GPU pagetables */ adreno_dev->gpuhtw_llc_slice = llcc_slice_getd(LLCC_GPUHTW); @@ -1252,12 +1252,18 @@ static int adreno_probe_llcc(struct adreno_device *adreno_dev, if (ret != -ENOENT) dev_warn(&pdev->dev, "Unable to get GPU HTW LLC slice: %d\n", ret); - } - - adreno_dev->gpuhtw_llc_slice_enable = true; + } else + adreno_dev->gpuhtw_llc_slice_enable = true; return 0; } +#else +static int adreno_probe_llcc(struct adreno_device *adreno_dev, + struct platform_device *pdev) +{ + return 0; +} +#endif static const struct kgsl_functable adreno_functable;