rockchip:midgard:update to r4p1_01dev0

[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 c85f63ed05af9563173d83eb5542c238e1e72331..ca7935f64c133789f671bd8e8bf05e8e7d70c7bb 100755 (executable)
--- a/drivers/gpu/arm/midgard/mali_kbase_jm.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_jm.c
@@ -30,7 +30,7 @@
 
 #include "mali_kbase_jm.h"
 
-#define beenthere(kctx, f, a...)  KBASE_LOG(1, kctx->kbdev->dev, "%s:" f, __func__, ##a)
+#define beenthere(kctx, f, a...)  dev_dbg(kctx->kbdev->dev, "%s:" f, __func__, ##a)
 
 #ifdef CONFIG_MALI_DEBUG_SHADER_SPLIT_FS
 u64 mali_js0_affinity_mask = 0xFFFFFFFFFFFFFFFFULL;
@@ -122,7 +122,7 @@ static void kbase_job_hw_submit(kbase_device *kbdev, kbase_jd_atom *katom, int j
        katom->start_timestamp = ktime_get();
 
        /* GO ! */
-       KBASE_LOG(2, kbdev->dev, "JS: Submitting atom %p from ctx %p to js[%d] with head=0x%llx, affinity=0x%llx", katom, kctx, js, jc_head, katom->affinity);
+       dev_dbg(kbdev->dev, "JS: Submitting atom %p from ctx %p to js[%d] with head=0x%llx, affinity=0x%llx", katom, kctx, js, jc_head, katom->affinity);
 
        KBASE_TRACE_ADD_SLOT_INFO(kbdev, JM_SUBMIT, kctx, katom, jc_head, js, (u32) katom->affinity);
 
@@ -375,7 +375,7 @@ void kbase_job_done(kbase_device *kbdev, u32 done)
                                }
                        }
 
-                       KBASE_LOG(2, kbdev->dev, "Job ended with status 0x%08X\n", completion_code);
+                       dev_dbg(kbdev->dev, "Job ended with status 0x%08X\n", completion_code);
 
                        nr_done = kbasep_jm_nr_jobs_submitted(slot);
                        nr_done -= (active >> i) & 1;
@@ -471,7 +471,7 @@ static void kbasep_job_slot_soft_or_hard_stop_do_action(kbase_device *kbdev, int
                mali_bool soft_stop_allowed = kbasep_soft_stop_allowed(kbdev, core_reqs);
                if (!soft_stop_allowed) {
 #ifdef CONFIG_MALI_DEBUG
-                       KBASE_LOG(2, kbdev->dev, "Attempt made to soft-stop a job that cannot be soft-stopped. core_reqs = 0x%X", (unsigned int)core_reqs);
+                       dev_dbg(kbdev->dev, "Attempt made to soft-stop a job that cannot be soft-stopped. core_reqs = 0x%X", (unsigned int)core_reqs);
 #endif                         /* CONFIG_MALI_DEBUG */
                        return;
                }
@@ -844,7 +844,7 @@ void kbase_job_zap_context(kbase_context *kctx)
        mutex_lock(&js_kctx_info->ctx.jsctx_mutex);
        js_kctx_info->ctx.is_dying = MALI_TRUE;
 
-       KBASE_LOG(1, kbdev->dev, "Zap: Try Evict Ctx %p", kctx);
+       dev_dbg(kbdev->dev, "Zap: Try Evict Ctx %p", kctx);
        mutex_lock(&js_devdata->queue_mutex);
        evict_success = kbasep_js_policy_try_evict_ctx(&js_devdata->policy, kctx);
        mutex_unlock(&js_devdata->queue_mutex);
@@ -897,7 +897,7 @@ void kbase_job_zap_context(kbase_context *kctx)
 
                KBASE_TRACE_ADD(kbdev, JM_ZAP_NON_SCHEDULED, kctx, NULL, 0u, js_kctx_info->ctx.is_scheduled);
 
-               KBASE_LOG(2, kbdev->dev, "Zap: Ctx %p evict_success=%d, scheduled=%d", kctx, evict_success, js_kctx_info->ctx.is_scheduled);
+               dev_dbg(kbdev->dev, "Zap: Ctx %p evict_success=%d, scheduled=%d", kctx, evict_success, js_kctx_info->ctx.is_scheduled);
 
                if (evict_success != MALI_FALSE) {
                        /* Only cancel jobs when we evicted from the policy queue. No Power
@@ -912,7 +912,7 @@ void kbase_job_zap_context(kbase_context *kctx)
                mali_bool was_retained;
                /* Case c: didn't evict, but it is scheduled - it's in the Run Pool */
                KBASE_TRACE_ADD(kbdev, JM_ZAP_SCHEDULED, kctx, NULL, 0u, js_kctx_info->ctx.is_scheduled);
-               KBASE_LOG(2, kbdev->dev, "Zap: Ctx %p is in RunPool", kctx);
+               dev_dbg(kbdev->dev, "Zap: Ctx %p is in RunPool", kctx);
 
                /* Disable the ctx from submitting any more jobs */
                spin_lock_irqsave(&js_devdata->runpool_irq.lock, flags);
@@ -925,7 +925,7 @@ void kbase_job_zap_context(kbase_context *kctx)
                /* Since it's scheduled and we have the jsctx_mutex, it must be retained successfully */
                KBASE_DEBUG_ASSERT(was_retained != MALI_FALSE);
 
-               KBASE_LOG(2, kbdev->dev, "Zap: Ctx %p Kill Any Running jobs", kctx);
+               dev_dbg(kbdev->dev, "Zap: Ctx %p Kill Any Running jobs", kctx);
                /* Cancel any remaining running jobs for this kctx - if any. Submit is disallowed
                 * which takes effect immediately, so no more new jobs will appear after we do this.  */
                for (i = 0; i < kbdev->gpu_props.num_job_slots; i++)
@@ -934,7 +934,7 @@ void kbase_job_zap_context(kbase_context *kctx)
                spin_unlock_irqrestore(&js_devdata->runpool_irq.lock, flags);
                mutex_unlock(&js_kctx_info->ctx.jsctx_mutex);
 
-               KBASE_LOG(2, kbdev->dev, "Zap: Ctx %p Release (may or may not schedule out immediately)", kctx);
+               dev_dbg(kbdev->dev, "Zap: Ctx %p Release (may or may not schedule out immediately)", kctx);
                kbasep_js_runpool_release_ctx(kbdev, kctx);
        }
        KBASE_TRACE_ADD(kbdev, JM_ZAP_DONE, kctx, NULL, 0u, 0u);