diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-27 18:11:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-27 18:11:56 -0700 |
| commit | 50fbdbba867a074acb9d6f020f02ebe46caae54f (patch) | |
| tree | 5fb92724ca2213947e9b813dfb507a94a457e8d1 | |
| parent | 11d6b41f25d5ba912ade681bc5a8a78e5ba99efa (diff) | |
| parent | 76abd2b2fb031197548905a96d2166fb6b2df5d0 (diff) | |
Merge "msm: mdss: Use 64-bit math for bandwidth calculation"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.h | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp.h b/drivers/video/fbdev/msm/mdss_mdp.h index fd2c2cdb3820..cd403f19c088 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.h +++ b/drivers/video/fbdev/msm/mdss_mdp.h @@ -1785,7 +1785,7 @@ void mdss_mdp_ctl_notifier_register(struct mdss_mdp_ctl *ctl, void mdss_mdp_ctl_notifier_unregister(struct mdss_mdp_ctl *ctl, struct notifier_block *notifier); u32 mdss_mdp_ctl_perf_get_transaction_status(struct mdss_mdp_ctl *ctl); -u32 apply_comp_ratio_factor(u32 quota, struct mdss_mdp_format_params *fmt, +u64 apply_comp_ratio_factor(u64 quota, struct mdss_mdp_format_params *fmt, struct mult_factor *factor); int mdss_mdp_scan_pipes(void); diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index c062de3c1e59..359284f36c63 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -815,7 +815,7 @@ static inline bool validate_comp_ratio(struct mult_factor *factor) return factor->numer && factor->denom; } -u32 apply_comp_ratio_factor(u32 quota, +u64 apply_comp_ratio_factor(u64 quota, struct mdss_mdp_format_params *fmt, struct mult_factor *factor) { |