Merge "msm: kgsl: Disable gpu_llc flags by default" (e61a99a6) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/gpu/msm/adreno.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -1218,6 +1218,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)
		{
		@@ -1235,8 +1236,7 @@ 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);
		}

		} else
		adreno_dev->gpu_llc_slice_enable = true;

		/* Get the system cache slice descriptor for GPU pagetables */
		@@ -1251,12 +1251,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);
		}

		} 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;