diff options
| author | Rob Clark <robdclark@gmail.com> | 2015-06-04 17:26:37 +0300 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2015-06-11 20:11:01 +0300 |
| commit | 6490ad47404539b479ca33f96793c4624bef2924 (patch) | |
| tree | ad83d20f75724c2ba3eaf202e7b67eb3220016ae /drivers/gpu/drm/msm/adreno/adreno_device.c | |
| parent | 570655b09b065d2fff1b8ab9bdb8308f4c5a05a3 (diff) | |
| download | linux-6490ad47404539b479ca33f96793c4624bef2924.tar.xz | |
drm/msm: clarify downstream bus scaling
A few spots in the driver have support for downstream android
CONFIG_MSM_BUS_SCALING. This is mainly to simplify backporting the
driver for various devices which do not have sufficient upstream
kernel support. But the intentionally dead code seems to cause
some confusion. Rename the #define to make this more clear.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/adreno/adreno_device.c')
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/adreno_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index be83dee83d08..37b18e2c9a3c 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -19,7 +19,7 @@ #include "adreno_gpu.h" -#if defined(CONFIG_MSM_BUS_SCALING) && !defined(CONFIG_OF) +#if defined(DOWNSTREAM_CONFIG_MSM_BUS_SCALING) && !defined(CONFIG_OF) # include <mach/kgsl.h> #endif @@ -240,7 +240,7 @@ static int adreno_bind(struct device *dev, struct device *master, void *data) config.rev = ADRENO_REV(3, 0, 5, 0); } -# ifdef CONFIG_MSM_BUS_SCALING +# ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING config.bus_scale_table = pdata->bus_scale_table; # endif #endif |