diff options
| author | Rogelio Garcia <rgarcia@ti.com> | 2012-03-20 10:04:43 -0500 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 12:57:26 +0200 |
| commit | bf927113ecf089ca1bd2fb43fedd87deaf6adc78 (patch) | |
| tree | 569b4c03b8a32c68e9f8e413355acdf802585ddf | |
| parent | fbac5f4ae6aa41b353df66974a63a183c813103c (diff) | |
| download | kernel_samsung_tuna-bf927113ecf089ca1bd2fb43fedd87deaf6adc78.zip kernel_samsung_tuna-bf927113ecf089ca1bd2fb43fedd87deaf6adc78.tar.gz kernel_samsung_tuna-bf927113ecf089ca1bd2fb43fedd87deaf6adc78.tar.bz2 | |
omap: Adds access_process_vm to gpu platform data
This core API function is needed by modular PVR driver.
Change-Id: I409bf934aa3c2566f468715e490c911b97b247bc
Signed-off-by: Rogelio Garcia <rgarcia@ti.com>
Signed-off-by: Atanas (Tony) Zlatinski <zlatinski@gmail.com>
Conflicts:
arch/arm/configs/tuna_defconfig
| -rwxr-xr-x | arch/arm/configs/tuna_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/gpu.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/tuna_defconfig b/arch/arm/configs/tuna_defconfig index cc03bf8..b55edc5 100755 --- a/arch/arm/configs/tuna_defconfig +++ b/arch/arm/configs/tuna_defconfig @@ -1,5 +1,5 @@ CONFIG_EXPERIMENTAL=y -CONFIG_LOCALVERSION="-Android-R0001" +CONFIG_LOCALVERSION="-00002-OMAP-Android" # CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 4f13bd8..5305782 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -16,6 +16,7 @@ #include <linux/clk.h> #include <linux/err.h> #include <linux/slab.h> +#include <linux/mm.h> #include <mach/hardware.h> #include <mach/irqs.h> @@ -923,6 +924,7 @@ static void omap_init_gpu(void) pdata->device_shutdown = omap_device_shutdown; pdata->opp_get_opp_count = opp_get_opp_count; pdata->opp_find_freq_ceil = opp_find_freq_ceil; + pdata->access_process_vm = access_process_vm; pdata->ovfreqs = 0; if (cpu_is_omap446x()) diff --git a/arch/arm/plat-omap/include/plat/gpu.h b/arch/arm/plat-omap/include/plat/gpu.h index ae6cf70..9d6de08 100644 --- a/arch/arm/plat-omap/include/plat/gpu.h +++ b/arch/arm/plat-omap/include/plat/gpu.h @@ -37,6 +37,8 @@ struct gpu_platform_data { int (*opp_get_opp_count) (struct device *dev); struct opp *(*opp_find_freq_ceil) (struct device *dev, unsigned long *freq); + int (*access_process_vm) (struct task_struct *tsk, unsigned long addr, + void *buf, int len, int write); }; #endif |