MALI: rockchip: upgrade midgard DDK to r14p0-01rel0

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / arm / midgard / mali_kbase_trace_timeline.c

diff --git a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c
index a606ae810656da8ec1c8b789061cd231da827998..5830e87f0818b62e46ce666cc3109ec785b3eab9 100644 (file)
--- a/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_trace_timeline.c
@@ -105,6 +105,8 @@ static const struct file_operations kbasep_trace_timeline_debugfs_fops = {
        .release = seq_release,
 };
 
+#ifdef CONFIG_DEBUG_FS
+
 void kbasep_trace_timeline_debugfs_init(struct kbase_device *kbdev)
 {
        debugfs_create_file("mali_timeline_defs",
@@ -112,10 +114,12 @@ void kbasep_trace_timeline_debugfs_init(struct kbase_device *kbdev)
                        &kbasep_trace_timeline_debugfs_fops);
 }
 
+#endif /* CONFIG_DEBUG_FS */
+
 void kbase_timeline_job_slot_submit(struct kbase_device *kbdev, struct kbase_context *kctx,
                struct kbase_jd_atom *katom, int js)
 {
-       lockdep_assert_held(&kbdev->js_data.runpool_irq.lock);
+       lockdep_assert_held(&kbdev->hwaccess_lock);
 
        if (kbdev->timeline.slot_atoms_submitted[js] > 0) {
                KBASE_TIMELINE_JOB_START_NEXT(kctx, js, 1);
@@ -134,7 +138,7 @@ void kbase_timeline_job_slot_done(struct kbase_device *kbdev, struct kbase_conte
                struct kbase_jd_atom *katom, int js,
                kbasep_js_atom_done_code done_code)
 {
-       lockdep_assert_held(&kbdev->js_data.runpool_irq.lock);
+       lockdep_assert_held(&kbdev->hwaccess_lock);
 
        if (done_code & KBASE_JS_ATOM_DONE_EVICTED_FROM_NEXT) {
                KBASE_TIMELINE_JOB_START_NEXT(kctx, js, 0);
@@ -213,7 +217,7 @@ void kbase_timeline_pm_handle_event(struct kbase_device *kbdev, enum kbase_timel
 
 void kbase_timeline_pm_l2_transition_start(struct kbase_device *kbdev)
 {
-       lockdep_assert_held(&kbdev->pm.power_change_lock);
+       lockdep_assert_held(&kbdev->hwaccess_lock);
        /* Simply log the start of the transition */
        kbdev->timeline.l2_transitioning = true;
        KBASE_TIMELINE_POWERING_L2(kbdev);
@@ -221,7 +225,7 @@ void kbase_timeline_pm_l2_transition_start(struct kbase_device *kbdev)
 
 void kbase_timeline_pm_l2_transition_done(struct kbase_device *kbdev)
 {
-       lockdep_assert_held(&kbdev->pm.power_change_lock);
+       lockdep_assert_held(&kbdev->hwaccess_lock);
        /* Simply log the end of the transition */
        if (kbdev->timeline.l2_transitioning) {
                kbdev->timeline.l2_transitioning = false;