Commit 3f307963 authored by Stephane Viau's avatar Stephane Viau Committed by Rob Clark

drm/msm/mdp5: get the core clock rate from MDP5 config

The core clock rate depends on the hw configuration. Once we have
read the hardware revision, we can set the core clock to its
maximum value.
Before then, the clock is set at a rate supported by all MDP5
revisions.
Signed-off-by: default avatarStephane Viau <sviau@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent f6a8eaca
...@@ -62,6 +62,7 @@ static const struct mdp5_config msm8x74_config = { ...@@ -62,6 +62,7 @@ static const struct mdp5_config msm8x74_config = {
.count = 4, .count = 4,
.base = { 0x12500, 0x12700, 0x12900, 0x12b00 }, .base = { 0x12500, 0x12700, 0x12900, 0x12b00 },
}, },
.max_clk = 200000000,
}; };
static const struct mdp5_config apq8084_config = { static const struct mdp5_config apq8084_config = {
...@@ -99,6 +100,7 @@ static const struct mdp5_config apq8084_config = { ...@@ -99,6 +100,7 @@ static const struct mdp5_config apq8084_config = {
.count = 5, .count = 5,
.base = { 0x12500, 0x12700, 0x12900, 0x12b00, 0x12d00 }, .base = { 0x12500, 0x12700, 0x12900, 0x12b00, 0x12d00 },
}, },
.max_clk = 320000000,
}; };
struct mdp5_config_entry { struct mdp5_config_entry {
...@@ -427,12 +429,13 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) ...@@ -427,12 +429,13 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
if (ret) if (ret)
goto fail; goto fail;
ret = clk_set_rate(mdp5_kms->src_clk, config->max_clk);
ret = mdp5_select_hw_cfg(kms); ret = mdp5_select_hw_cfg(kms);
if (ret) if (ret)
goto fail; goto fail;
/* TODO: compute core clock rate at runtime */
clk_set_rate(mdp5_kms->src_clk, mdp5_kms->hw_cfg->max_clk);
/* make sure things are off before attaching iommu (bootloader could /* make sure things are off before attaching iommu (bootloader could
* have left things on, in which case we'll start getting faults if * have left things on, in which case we'll start getting faults if
* we don't disable): * we don't disable):
...@@ -493,8 +496,6 @@ static struct mdp5_platform_config *mdp5_get_config(struct platform_device *dev) ...@@ -493,8 +496,6 @@ static struct mdp5_platform_config *mdp5_get_config(struct platform_device *dev)
/* TODO */ /* TODO */
#endif #endif
config.iommu = iommu_domain_alloc(&platform_bus_type); config.iommu = iommu_domain_alloc(&platform_bus_type);
/* TODO hard-coded in downstream mdss, but should it be? */
config.max_clk = 200000000;
/* TODO get from DT: */ /* TODO get from DT: */
config.smp_blk_cnt = 22; config.smp_blk_cnt = 22;
......
...@@ -37,6 +37,8 @@ struct mdp5_config { ...@@ -37,6 +37,8 @@ struct mdp5_config {
struct mdp5_sub_block dspp; struct mdp5_sub_block dspp;
struct mdp5_sub_block ad; struct mdp5_sub_block ad;
struct mdp5_sub_block intf; struct mdp5_sub_block intf;
uint32_t max_clk;
}; };
extern const struct mdp5_config *mdp5_cfg; extern const struct mdp5_config *mdp5_cfg;
#include "mdp5.xml.h" #include "mdp5.xml.h"
...@@ -83,7 +85,6 @@ struct mdp5_kms { ...@@ -83,7 +85,6 @@ struct mdp5_kms {
/* platform config data (ie. from DT, or pdata) */ /* platform config data (ie. from DT, or pdata) */
struct mdp5_platform_config { struct mdp5_platform_config {
struct iommu_domain *iommu; struct iommu_domain *iommu;
uint32_t max_clk;
int smp_blk_cnt; int smp_blk_cnt;
}; };
......
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