shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-04 10:12:16 +09:00
Code Issues Packages Projects Releases Wiki Activity

mali: fixes ump build

Browse Source 
Change-Id: I7431bc059a011c8db122ece1c35749c0593b7b19

Signed-off-by: Dongjin Kim <tobetter@gmail.com>
This commit is contained in:
Mauro Ribeiro
2014-10-15 02:50:36 -03:00
committed by Dongjin Kim
parent ffbffa319f
commit d9c74f71b0
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/arm/mali/linux/mali_memory_types.h
View File

@@ -12,7 +12,7 @@
#define __MALI_MEMORY_TYPES_H__
#if defined(CONFIG_MALI400_UMP)
#include "ump_kernel_interface.h"
#include <ump/ump_kernel_interface.h>
#endif
typedef u32 mali_address_t;

2
drivers/gpu/arm/mali/linux/mali_memory_ump.c
View File

@@ -16,7 +16,7 @@
#include "mali_memory.h"
#include "ump_kernel_interface.h"
#include <ump/ump_kernel_interface.h>
static int mali_ump_map(struct mali_session_data *session, mali_mem_allocation *descriptor)
{

12
drivers/gpu/arm/ump/Kbuild
View File

@@ -66,12 +66,12 @@ ump-y = common/ump_kernel_common.o \
linux/ump_ukk_ref_wrappers.o \
linux/ump_osk_atomics.o \
linux/ump_osk_low_level_mem.o \
linux/ump_osk_misc.o \
$(UDD_FILE_PREFIX)linux/mali_osk_atomics.o \
$(UDD_FILE_PREFIX)linux/mali_osk_locks.o \
$(UDD_FILE_PREFIX)linux/mali_osk_memory.o \
$(UDD_FILE_PREFIX)linux/mali_osk_math.o \
$(UDD_FILE_PREFIX)linux/mali_osk_misc.o
linux/ump_osk_misc.o
# $(UDD_FILE_PREFIX)linux/mali_osk_atomics.o \
# $(UDD_FILE_PREFIX)linux/mali_osk_locks.o \
# $(UDD_FILE_PREFIX)linux/mali_osk_memory.o \
# $(UDD_FILE_PREFIX)linux/mali_osk_math.o \
# $(UDD_FILE_PREFIX)linux/mali_osk_misc.o
obj-$(CONFIG_UMP) := ump.o

2
drivers/gpu/arm/ump/common/ump_kernel_api.c
View File

@@ -12,7 +12,7 @@
#include "mali_osk_list.h"
#include "ump_osk.h"
#include "ump_uk_types.h"
#include "ump_kernel_interface.h"
#include <ump/ump_kernel_interface.h>
#include "ump_kernel_common.h"

2
drivers/gpu/arm/ump/common/ump_kernel_common.h
View File

@@ -12,7 +12,7 @@
#define __UMP_KERNEL_COMMON_H__
#include "ump_kernel_types.h"
#include "ump_kernel_interface.h"
#include <ump/ump_kernel_interface.h>
#include "ump_kernel_descriptor_mapping.h"
#include "ump_kernel_memory_backend.h"

2
drivers/gpu/arm/ump/common/ump_kernel_memory_backend.h
View File

@@ -15,7 +15,7 @@
#ifndef __UMP_KERNEL_MEMORY_BACKEND_H__
#define __UMP_KERNEL_MEMORY_BACKEND_H__
#include "ump_kernel_interface.h"
#include <ump/ump_kernel_interface.h>
#include "ump_kernel_types.h"

2
drivers/gpu/arm/ump/common/ump_kernel_ref_drv.c
View File

@@ -13,7 +13,7 @@
#include "ump_osk.h"
#include "ump_uk_types.h"
#include "ump_kernel_interface_ref_drv.h"
#include <ump/ump_kernel_interface_ref_drv.h>
#include "ump_kernel_common.h"
#include "ump_kernel_descriptor_mapping.h"

2
drivers/gpu/arm/ump/common/ump_kernel_types.h
View File

@@ -11,7 +11,7 @@
#ifndef __UMP_KERNEL_TYPES_H__
#define __UMP_KERNEL_TYPES_H__
#include "ump_kernel_interface.h"
#include <ump/ump_kernel_interface.h>
#include "mali_osk.h"

8
drivers/gpu/arm/ump/linux/ump_kernel_linux.c
View File

@@ -21,8 +21,8 @@
#include "arch/config.h" /* Configuration for current platform. The symlinc for arch is set by Makefile */
#include "ump_ioctl.h"
#include "ump_kernel_common.h"
#include "ump_kernel_interface.h"
#include "ump_kernel_interface_ref_drv.h"
#include <ump/ump_kernel_interface.h>
#include <ump/ump_kernel_interface_ref_drv.h>
#include "ump_kernel_descriptor_mapping.h"
#include "ump_kernel_memory_backend.h"
#include "ump_kernel_memory_backend_os.h"
@@ -356,7 +356,7 @@ static int ump_file_ioctl(struct inode *inode, struct file *filp, unsigned int c
return err;
}
int map_errcode( _mali_osk_errcode_t err )
/*int map_errcode( _mali_osk_errcode_t err )
{
switch(err) {
case _MALI_OSK_ERR_OK :
@@ -378,7 +378,7 @@ int map_errcode( _mali_osk_errcode_t err )
default:
return -EFAULT;
}
}
}*/
/*
* Handle from OS to map specified virtual memory to specified UMP memory.