projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MALI: rockchip: upgrade midgard DDK to r14p0-01rel0
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
arm
/
midgard
/
mali_kbase_jm.c
diff --git
a/drivers/gpu/arm/midgard/mali_kbase_jm.c
b/drivers/gpu/arm/midgard/mali_kbase_jm.c
index 63425322452b6a98368228fda471fadbad7d8e05..0c5c6a6f78cb39f1c2474cccf8c651f070b86204 100644
(file)
--- a/
drivers/gpu/arm/midgard/mali_kbase_jm.c
+++ b/
drivers/gpu/arm/midgard/mali_kbase_jm.c
@@
-1,6
+1,6
@@
/*
*
/*
*
- * (C) COPYRIGHT 2014-201
5
ARM Limited. All rights reserved.
+ * (C) COPYRIGHT 2014-201
6
ARM Limited. All rights reserved.
*
* This program is free software and is provided to you under the terms of the
* GNU General Public License version 2 as published by the Free Software
*
* This program is free software and is provided to you under the terms of the
* GNU General Public License version 2 as published by the Free Software
@@
-60,7
+60,7
@@
u32 kbase_jm_kick(struct kbase_device *kbdev, u32 js_mask)
{
u32 ret_mask = 0;
{
u32 ret_mask = 0;
- lockdep_assert_held(&kbdev->
js_data.runpool_irq.
lock);
+ lockdep_assert_held(&kbdev->
hwaccess_
lock);
while (js_mask) {
int js = ffs(js_mask) - 1;
while (js_mask) {
int js = ffs(js_mask) - 1;
@@
-79,7
+79,7
@@
void kbase_jm_try_kick(struct kbase_device *kbdev, u32 js_mask)
{
struct kbasep_js_device_data *js_devdata = &kbdev->js_data;
{
struct kbasep_js_device_data *js_devdata = &kbdev->js_data;
- lockdep_assert_held(&
js_devdata->runpool_irq.
lock);
+ lockdep_assert_held(&
kbdev->hwaccess_
lock);
if (!down_trylock(&js_devdata->schedule_sem)) {
kbase_jm_kick(kbdev, js_mask);
if (!down_trylock(&js_devdata->schedule_sem)) {
kbase_jm_kick(kbdev, js_mask);
@@
-91,7
+91,7
@@
void kbase_jm_try_kick_all(struct kbase_device *kbdev)
{
struct kbasep_js_device_data *js_devdata = &kbdev->js_data;
{
struct kbasep_js_device_data *js_devdata = &kbdev->js_data;
- lockdep_assert_held(&
js_devdata->runpool_irq.
lock);
+ lockdep_assert_held(&
kbdev->hwaccess_
lock);
if (!down_trylock(&js_devdata->schedule_sem)) {
kbase_jm_kick_all(kbdev);
if (!down_trylock(&js_devdata->schedule_sem)) {
kbase_jm_kick_all(kbdev);
@@
-101,30
+101,31
@@
void kbase_jm_try_kick_all(struct kbase_device *kbdev)
void kbase_jm_idle_ctx(struct kbase_device *kbdev, struct kbase_context *kctx)
{
void kbase_jm_idle_ctx(struct kbase_device *kbdev, struct kbase_context *kctx)
{
- lockdep_assert_held(&kbdev->
js_data.runpool_irq.
lock);
+ lockdep_assert_held(&kbdev->
hwaccess_
lock);
if (kbdev->hwaccess.active_kctx == kctx)
kbdev->hwaccess.active_kctx = NULL;
}
if (kbdev->hwaccess.active_kctx == kctx)
kbdev->hwaccess.active_kctx = NULL;
}
-
void
kbase_jm_return_atom_to_js(struct kbase_device *kbdev,
+
struct kbase_jd_atom *
kbase_jm_return_atom_to_js(struct kbase_device *kbdev,
struct kbase_jd_atom *katom)
{
struct kbase_jd_atom *katom)
{
- lockdep_assert_held(&kbdev->
js_data.runpool_irq.
lock);
+ lockdep_assert_held(&kbdev->
hwaccess_
lock);
if (katom->event_code != BASE_JD_EVENT_STOPPED &&
katom->event_code != BASE_JD_EVENT_REMOVED_FROM_NEXT) {
if (katom->event_code != BASE_JD_EVENT_STOPPED &&
katom->event_code != BASE_JD_EVENT_REMOVED_FROM_NEXT) {
- kbase_js_complete_atom(katom, NULL);
+
return
kbase_js_complete_atom(katom, NULL);
} else {
kbase_js_unpull(katom->kctx, katom);
} else {
kbase_js_unpull(katom->kctx, katom);
+ return NULL;
}
}
}
}
-
void kbase_jm_complete(struct kbase_device *kbdev, struct kbase_jd_atom *katom
,
-
ktime_t *end_timestamp)
+
struct kbase_jd_atom *kbase_jm_complete(struct kbase_device *kbdev
,
+
struct kbase_jd_atom *katom,
ktime_t *end_timestamp)
{
{
- lockdep_assert_held(&kbdev->
js_data.runpool_irq.
lock);
+ lockdep_assert_held(&kbdev->
hwaccess_
lock);
- kbase_js_complete_atom(katom, end_timestamp);
+
return
kbase_js_complete_atom(katom, end_timestamp);
}
}