evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "clk: qcom: mdss: avoid release of the dynamic fps PLL code memory"

Browse source
This commit is contained in:
Linux Build Service Account 2018-10-11 21:19:41 -07:00 • committed by Gerrit - the friendly Code Review server
commit fb9adab2b9
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/clk/qcom/mdss/mdss-pll-util.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2013-2016, 2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -327,16 +327,6 @@ clk_err:
return rc; return rc;
} }
static void mdss_pll_free_bootmem(u32 mem_addr, u32 size)
{
unsigned long pfn_start, pfn_end, pfn_idx;
pfn_start = mem_addr >> PAGE_SHIFT;
pfn_end = (mem_addr + size) >> PAGE_SHIFT;
for (pfn_idx = pfn_start; pfn_idx < pfn_end; pfn_idx++)
free_reserved_page(pfn_to_page(pfn_idx));
}
static int mdss_pll_util_parse_dt_dfps(struct platform_device *pdev, static int mdss_pll_util_parse_dt_dfps(struct platform_device *pdev,
struct mdss_pll_resources *pll_res) struct mdss_pll_resources *pll_res)
{ {
@ -367,7 +357,7 @@ static int mdss_pll_util_parse_dt_dfps(struct platform_device *pdev,
area = get_vm_area(offsets[1], VM_IOREMAP); area = get_vm_area(offsets[1], VM_IOREMAP);
if (!area) { if (!area) {
rc = -ENOMEM; rc = -ENOMEM;
goto dfps_mem_err; goto pnode_err;
} }
virt_add = (unsigned long)area->addr; virt_add = (unsigned long)area->addr;
@ -394,10 +384,6 @@ addr_err:
ioremap_err: ioremap_err:
if (area) if (area)
vfree(area->addr); vfree(area->addr);
dfps_mem_err:
/* free the dfps memory here */
memblock_free(offsets[0], offsets[1]);
mdss_pll_free_bootmem(offsets[0], offsets[1]);
pnode_err: pnode_err:
if (pnode) if (pnode)
of_node_put(pnode); of_node_put(pnode);