Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / gvt / sched_policy.c

diff --git a/drivers/gpu/drm/i915/gvt/sched_policy.c b/drivers/gpu/drm/i915/gvt/sched_policy.c
index c32e7d5e862914b787d7cf5cbf706cb5c4a41748..1c763a27a41219614080e7a7101c2bb3de56fdf4 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/sched_policy.c
+++ b/drivers/gpu/drm/i915/gvt/sched_policy.c
@@ -94,7 +94,7 @@ static void gvt_balance_timeslice(struct gvt_sched_data *sched_data)
 {
        struct vgpu_sched_data *vgpu_data;
        struct list_head *pos;
-       static uint64_t stage_check;
+       static u64 stage_check;
        int stage = stage_check++ % GVT_TS_BALANCE_STAGE_NUM;
 
        /* The timeslice accumulation reset at stage 0, which is
@@ -474,6 +474,6 @@ void intel_vgpu_stop_schedule(struct intel_vgpu *vgpu)
                }
        }
        spin_unlock_bh(&scheduler->mmio_context_lock);
-       intel_runtime_pm_put(dev_priv);
+       intel_runtime_pm_put_unchecked(dev_priv);
        mutex_unlock(&vgpu->gvt->sched_lock);
 }