mali mess

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / misc / mediatek / gpu / mt8127 / mali / mali / linux / mali_ukk_pp.c

diff --git a/drivers/misc/mediatek/gpu/mt8127/mali/mali/linux/mali_ukk_pp.c b/drivers/misc/mediatek/gpu/mt8127/mali/mali/linux/mali_ukk_pp.c
index 1519230b8be085bd6ee47aac3fe217c757ae23c1..d9ad52590c24690a0e55ab8887e4a3c0f8ce6fa0 100644 (file)
--- a/drivers/misc/mediatek/gpu/mt8127/mali/mali/linux/mali_ukk_pp.c
+++ b/drivers/misc/mediatek/gpu/mt8127/mali/mali/linux/mali_ukk_pp.c
@@ -1,7 +1,7 @@
 /*
  * This confidential and proprietary software may be used only as
  * authorised by a licensing agreement from ARM Limited
- * (C) COPYRIGHT 2008-2010, 2012-2013 ARM Limited
+ * (C) COPYRIGHT 2008-2010, 2012-2015 ARM Limited
  * ALL RIGHTS RESERVED
  * The entire notice above must be reproduced on all authorised
  * copies and copies may only be made to the extent permitted
@@ -57,14 +57,14 @@ int pp_get_number_of_cores_wrapper(struct mali_session_data *session_data, _mali
        MALI_CHECK_NON_NULL(uargs, -EINVAL);
        MALI_CHECK_NON_NULL(session_data, -EINVAL);
 
-       kargs.ctx = session_data;
+       kargs.ctx = (uintptr_t)session_data;
 
        err = _mali_ukk_get_pp_number_of_cores(&kargs);
        if (_MALI_OSK_ERR_OK != err) {
                return map_errcode(err);
        }
 
-       kargs.ctx = NULL; /* prevent kernel address to be returned to user space */
+       kargs.ctx = (uintptr_t)NULL; /* prevent kernel address to be returned to user space */
        if (0 != copy_to_user(uargs, &kargs, sizeof(_mali_uk_get_pp_number_of_cores_s))) {
                return -EFAULT;
        }
@@ -80,7 +80,7 @@ int pp_get_core_version_wrapper(struct mali_session_data *session_data, _mali_uk
        MALI_CHECK_NON_NULL(uargs, -EINVAL);
        MALI_CHECK_NON_NULL(session_data, -EINVAL);
 
-       kargs.ctx = session_data;
+       kargs.ctx = (uintptr_t)session_data;
        err = _mali_ukk_get_pp_core_version(&kargs);
        if (_MALI_OSK_ERR_OK != err) return map_errcode(err);
 
@@ -98,7 +98,7 @@ int pp_disable_wb_wrapper(struct mali_session_data *session_data, _mali_uk_pp_di
 
        if (0 != copy_from_user(&kargs, uargs, sizeof(_mali_uk_pp_disable_wb_s))) return -EFAULT;
 
-       kargs.ctx = session_data;
+       kargs.ctx = (uintptr_t)session_data;
        _mali_ukk_pp_job_disable_wb(&kargs);
 
        return 0;