UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/msm/mdp: Remove CONFIG_OF checks from MDP drivers 

We don't intend to use downstream non-DT kernels anymore, so remove
CONFIG_OF checks.

Update the TODO comment so that we don't forget about max_clk setting
for non APQ8064 chips having MDP4.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Archit Taneja 2015-11-18 12:44:52 +05:30 committed by Rob Clark
parent d2252563ee
commit d50c192afe
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
View File

@ -240,7 +240,6 @@ int mdp4_enable(struct mdp4_kms *mdp4_kms)
return 0; return 0;
} }
#ifdef CONFIG_OF
static struct drm_panel *detect_panel(struct drm_device *dev) static struct drm_panel *detect_panel(struct drm_device *dev)
{ {
struct device_node *endpoint, *panel_node; struct device_node *endpoint, *panel_node;
@ -270,12 +269,6 @@ static struct drm_panel *detect_panel(struct drm_device *dev)
return panel; return panel;
} }
#else
static struct drm_panel *detect_panel(struct drm_device *dev)
{
// ??? maybe use a module param to specify which panel is attached?
}
#endif
static int modeset_init(struct mdp4_kms *mdp4_kms) static int modeset_init(struct mdp4_kms *mdp4_kms)
{ {
@ -558,17 +551,10 @@ fail:
static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev) static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev)
{ {
static struct mdp4_platform_config config = {}; static struct mdp4_platform_config config = {};
#ifdef CONFIG_OF
/* TODO */ /* TODO: Chips that aren't apq8064 have a 200 Mhz max_clk */
config.max_clk = 266667000; config.max_clk = 266667000;
config.iommu = iommu_domain_alloc(&platform_bus_type); config.iommu = iommu_domain_alloc(&platform_bus_type);
#else
if (cpu_is_apq8064())
config.max_clk = 266667000;
else
config.max_clk = 200000000;
config.iommu = msm_get_iommu_domain(DISPLAY_READ_DOMAIN);
#endif
return &config; return &config;
} }

4
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
View File

@ -553,9 +553,7 @@ fail:
static struct mdp5_cfg_platform *mdp5_get_config(struct platform_device *dev) static struct mdp5_cfg_platform *mdp5_get_config(struct platform_device *dev)
{ {
static struct mdp5_cfg_platform config = {}; static struct mdp5_cfg_platform config = {};
#ifdef CONFIG_OF
/* TODO */
#endif
config.iommu = iommu_domain_alloc(&platform_bus_type); config.iommu = iommu_domain_alloc(&platform_bus_type);
return &config; return &config;