Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/msm/adreno/adreno_device.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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) 
			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

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

drivers/gpu/drm/msm/adreno/adreno_gpu.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

};

};

drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);