From bc39ad7239a956de69068934911ab2d0ab09cf55 Mon Sep 17 00:00:00 2001 From: sbrissen Date: Tue, 24 Jun 2014 10:59:02 -0400 Subject: smdk4412: update mali driver from GT-N7100_SEA_KK_Opensource Change-Id: I1ddaa2c88660427348f359a6477aced196c4d7dc --- drivers/gpu/mali400/r3p2/mali/common/mali_mem_validation.c | 2 +- .../gpu/mali400/r3p2/mali/platform/pegasus-m400/exynos4_pmm.c | 10 ++++++---- drivers/gpu/mali400/r3p2/ump/common/ump_kernel_common.c | 1 + .../gpu/mali400/r3p2/ump/linux/ump_kernel_memory_backend_os.c | 2 ++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/mali400/r3p2/mali/common/mali_mem_validation.c b/drivers/gpu/mali400/r3p2/mali/common/mali_mem_validation.c index aaf9c73..d20c88b 100644 --- a/drivers/gpu/mali400/r3p2/mali/common/mali_mem_validation.c +++ b/drivers/gpu/mali400/r3p2/mali/common/mali_mem_validation.c @@ -13,7 +13,7 @@ #include "mali_kernel_common.h" /* MALI_SEC */ #if defined(CONFIG_CPU_EXYNOS4212) || defined(CONFIG_CPU_EXYNOS4412) -//#define MALI_SEC_MEM_VALIDATION +#define MALI_SEC_MEM_VALIDATION #include #include #include diff --git a/drivers/gpu/mali400/r3p2/mali/platform/pegasus-m400/exynos4_pmm.c b/drivers/gpu/mali400/r3p2/mali/platform/pegasus-m400/exynos4_pmm.c index 346ad7f..ce74d80 100644 --- a/drivers/gpu/mali400/r3p2/mali/platform/pegasus-m400/exynos4_pmm.c +++ b/drivers/gpu/mali400/r3p2/mali/platform/pegasus-m400/exynos4_pmm.c @@ -106,8 +106,8 @@ mali_dvfs_table mali_dvfs[MALI_DVFS_STEPS]={ #define ASV_LEVEL 12 /* ASV0, 1, 11 is reserved */ #define ASV_LEVEL_PRIME 13 /* ASV0, 1, 12 is reserved */ #define ASV_LEVEL_PD 13 -#define ASV_LEVEL_4210_12 8 -#define ASV_LEVEL_4210_14 5 +#define ASV_LEVEL_4210_12» 8 +#define ASV_LEVEL_4210_14» 5 #if defined(CONFIG_CPU_EXYNOS4212) || defined(CONFIG_CPU_EXYNOS4412) static unsigned int asv_3d_volt_9_table_1ghz_type[MALI_DVFS_STEPS-1][ASV_LEVEL] = { @@ -163,7 +163,6 @@ static unsigned int asv_3d_volt_4212_9_table[MALI_DVFS_STEPS][ASV_LEVEL_PD] = { #endif #endif }; - #else static unsigned int asv_3d_volt_4210_12_table[MALI_DVFS_STEPS][ASV_LEVEL_4210_12] = { @@ -481,6 +480,9 @@ void mali_clk_set_rate(unsigned int clk, unsigned int mhz) if (bis_vpll) { + /* in Pega-prime, vpll_src_clock means ext_xtal_clock!! */ + clk_set_parent(sclk_vpll_clock, vpll_src_clock); + clk_set_rate(fout_vpll_clock, (unsigned int)clk * GPU_MHZ); clk_set_parent(vpll_src_clock, ext_xtal_clock); clk_set_parent(sclk_vpll_clock, fout_vpll_clock); @@ -1258,7 +1260,7 @@ int mali_dvfs_bottom_lock_pop(void) if (prev_status <= 0) { MALI_PRINT(("gpu bottom lock status is not valid for pop\n")); return -1; - } else if (prev_status == 1) { + } else if (prev_status >= 1) { bottom_lock_step = 0; MALI_PRINT(("gpu bottom lock release\n")); } diff --git a/drivers/gpu/mali400/r3p2/ump/common/ump_kernel_common.c b/drivers/gpu/mali400/r3p2/ump/common/ump_kernel_common.c index 306ea3d..cf072fb 100644 --- a/drivers/gpu/mali400/r3p2/ump/common/ump_kernel_common.c +++ b/drivers/gpu/mali400/r3p2/ump/common/ump_kernel_common.c @@ -339,6 +339,7 @@ _mali_osk_errcode_t _ump_ukk_map_mem( _ump_uk_map_mem_s *args ) if (_MALI_OSK_ERR_OK != _ump_osk_mem_mapregion_map(descriptor, offset, (u32 *)&(mem->block_array[block].addr), size_to_map ) ) { DBG_MSG(1, ("WARNING: _ump_ukk_map_mem failed to map memory into userspace\n")); + printk(KERN_ALERT"UMP:_ump_ukk_map_mem failed to map memory into userspace\n"); ump_descriptor_mapping_free( session_data->cookies_map, map_id ); ump_dd_reference_release(mem); _ump_osk_mem_mapregion_term( descriptor ); diff --git a/drivers/gpu/mali400/r3p2/ump/linux/ump_kernel_memory_backend_os.c b/drivers/gpu/mali400/r3p2/ump/linux/ump_kernel_memory_backend_os.c index 0cee2c8..57c2a7f 100644 --- a/drivers/gpu/mali400/r3p2/ump/linux/ump_kernel_memory_backend_os.c +++ b/drivers/gpu/mali400/r3p2/ump/linux/ump_kernel_memory_backend_os.c @@ -185,6 +185,8 @@ static int os_allocate(void* ctx, ump_dd_mem * descriptor) if (left) { DBG_MSG(1, ("Failed to allocate needed pages\n")); + printk(KERN_ALERT"UMP::Failed to allocated pages, totally pages = %d, allocated pages = %d, currently requested pages = %d \n", + (int)info->num_pages_max, (int)info->num_pages_allocated, left + pages_allocated); /* MALI_SEC */ DBG_MSG(1, ("UMP memory allocated: %d kB Configured maximum OS memory usage: %d kB\n", (pages_allocated * _MALI_OSK_CPU_PAGE_SIZE)/1024, (info->num_pages_max* _MALI_OSK_CPU_PAGE_SIZE)/1024)); -- cgit v1.1