Commit 6490ad47 authored by Rob Clark's avatar Rob Clark

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: default avatarRob Clark <robdclark@gmail.com>
parent 570655b0
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "adreno_gpu.h" #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> # include <mach/kgsl.h>
#endif #endif
...@@ -240,7 +240,7 @@ static int adreno_bind(struct device *dev, struct device *master, void *data) ...@@ -240,7 +240,7 @@ static int adreno_bind(struct device *dev, struct device *master, void *data)
config.rev = ADRENO_REV(3, 0, 5, 0); 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; config.bus_scale_table = pdata->bus_scale_table;
# endif # endif
#endif #endif
......
...@@ -334,7 +334,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, ...@@ -334,7 +334,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
gpu->fast_rate = config->fast_rate; gpu->fast_rate = config->fast_rate;
gpu->slow_rate = config->slow_rate; gpu->slow_rate = config->slow_rate;
gpu->bus_freq = config->bus_freq; gpu->bus_freq = config->bus_freq;
#ifdef CONFIG_MSM_BUS_SCALING #ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING
gpu->bus_scale_table = config->bus_scale_table; gpu->bus_scale_table = config->bus_scale_table;
#endif #endif
......
...@@ -167,7 +167,7 @@ struct adreno_gpu { ...@@ -167,7 +167,7 @@ struct adreno_gpu {
struct adreno_platform_config { struct adreno_platform_config {
struct adreno_rev rev; struct adreno_rev rev;
uint32_t fast_rate, slow_rate, bus_freq; uint32_t fast_rate, slow_rate, bus_freq;
#ifdef CONFIG_MSM_BUS_SCALING #ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING
struct msm_bus_scale_pdata *bus_scale_table; struct msm_bus_scale_pdata *bus_scale_table;
#endif #endif
}; };
......
...@@ -38,7 +38,7 @@ static struct mdp4_kms *get_kms(struct drm_encoder *encoder) ...@@ -38,7 +38,7 @@ static struct mdp4_kms *get_kms(struct drm_encoder *encoder)
return to_mdp4_kms(to_mdp_kms(priv->kms)); return to_mdp4_kms(to_mdp_kms(priv->kms));
} }
#ifdef CONFIG_MSM_BUS_SCALING #ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING
#include <mach/board.h> #include <mach/board.h>
/* not ironically named at all.. no, really.. */ /* not ironically named at all.. no, really.. */
static void bs_init(struct mdp4_dtv_encoder *mdp4_dtv_encoder) static void bs_init(struct mdp4_dtv_encoder *mdp4_dtv_encoder)
......
...@@ -229,7 +229,7 @@ static inline struct clk *mpd4_lvds_pll_init(struct drm_device *dev) ...@@ -229,7 +229,7 @@ static inline struct clk *mpd4_lvds_pll_init(struct drm_device *dev)
} }
#endif #endif
#ifdef CONFIG_MSM_BUS_SCALING #ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING
static inline int match_dev_name(struct device *dev, void *data) static inline int match_dev_name(struct device *dev, void *data)
{ {
return !strcmp(dev_name(dev), data); return !strcmp(dev_name(dev), data);
......
...@@ -38,7 +38,7 @@ static struct mdp4_kms *get_kms(struct drm_encoder *encoder) ...@@ -38,7 +38,7 @@ static struct mdp4_kms *get_kms(struct drm_encoder *encoder)
return to_mdp4_kms(to_mdp_kms(priv->kms)); return to_mdp4_kms(to_mdp_kms(priv->kms));
} }
#ifdef CONFIG_MSM_BUS_SCALING #ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING
#include <mach/board.h> #include <mach/board.h>
static void bs_init(struct mdp4_lcdc_encoder *mdp4_lcdc_encoder) static void bs_init(struct mdp4_lcdc_encoder *mdp4_lcdc_encoder)
{ {
......
...@@ -30,7 +30,7 @@ static struct mdp5_kms *get_kms(struct drm_encoder *encoder) ...@@ -30,7 +30,7 @@ static struct mdp5_kms *get_kms(struct drm_encoder *encoder)
return to_mdp5_kms(to_mdp_kms(priv->kms)); return to_mdp5_kms(to_mdp_kms(priv->kms));
} }
#ifdef CONFIG_MSM_BUS_SCALING #ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING
#include <mach/board.h> #include <mach/board.h>
#include <linux/msm-bus.h> #include <linux/msm-bus.h>
#include <linux/msm-bus-board.h> #include <linux/msm-bus-board.h>
......
...@@ -36,7 +36,7 @@ static struct mdp5_kms *get_kms(struct drm_encoder *encoder) ...@@ -36,7 +36,7 @@ static struct mdp5_kms *get_kms(struct drm_encoder *encoder)
return to_mdp5_kms(to_mdp_kms(priv->kms)); return to_mdp5_kms(to_mdp_kms(priv->kms));
} }
#ifdef CONFIG_MSM_BUS_SCALING #ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING
#include <mach/board.h> #include <mach/board.h>
#include <mach/msm_bus.h> #include <mach/msm_bus.h>
#include <mach/msm_bus_board.h> #include <mach/msm_bus_board.h>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
* Power Management: * Power Management:
*/ */
#ifdef CONFIG_MSM_BUS_SCALING #ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING
#include <mach/board.h> #include <mach/board.h>
static void bs_init(struct msm_gpu *gpu) static void bs_init(struct msm_gpu *gpu)
{ {
......
...@@ -103,7 +103,7 @@ struct msm_gpu { ...@@ -103,7 +103,7 @@ struct msm_gpu {
struct clk *ebi1_clk, *grp_clks[5]; struct clk *ebi1_clk, *grp_clks[5];
uint32_t fast_rate, slow_rate, bus_freq; uint32_t fast_rate, slow_rate, bus_freq;
#ifdef CONFIG_MSM_BUS_SCALING #ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING
struct msm_bus_scale_pdata *bus_scale_table; struct msm_bus_scale_pdata *bus_scale_table;
uint32_t bsc; uint32_t bsc;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment