drm/i915: Rename unpin_count to pin_count

We increase it when we pin, so for the casual reader
rename it to cause less confusion.

Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Thomas Daniel <thomas.daniel@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 56fd2b80f8afea7175c3ecfc58da400cab5f7c8d..de304d78e2bf3b3f97c5263cbd2ca7c225dc0587 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -765,7 +765,7 @@ struct intel_context {
        struct {
                struct drm_i915_gem_object *state;
                struct intel_ringbuffer *ringbuf;
-               int unpin_count;
+               int pin_count;
        } engine[I915_NUM_RINGS];
 
        struct list_head link;

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index ec3998c5d32ebc36d415753bd359248a7aa273ea..70e449b702ccefa38760f56d778e4fad01909fa3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -807,11 +807,11 @@ static int intel_lr_context_pin(struct intel_engine_cs *ring,
        int ret = 0;
 
        WARN_ON(!mutex_is_locked(&ring->dev->struct_mutex));
-       if (ctx->engine[ring->id].unpin_count++ == 0) {
+       if (ctx->engine[ring->id].pin_count++ == 0) {
                ret = i915_gem_obj_ggtt_pin(ctx_obj,
                                GEN8_LR_CONTEXT_ALIGN, 0);
                if (ret)
-                       goto reset_unpin_count;
+                       goto reset_pin_count;
 
                ret = intel_pin_and_map_ringbuffer_obj(ring->dev, ringbuf);
                if (ret)
@@ -822,8 +822,8 @@ static int intel_lr_context_pin(struct intel_engine_cs *ring,
 
 unpin_ctx_obj:
        i915_gem_object_ggtt_unpin(ctx_obj);
-reset_unpin_count:
-       ctx->engine[ring->id].unpin_count = 0;
+reset_pin_count:
+       ctx->engine[ring->id].pin_count = 0;
 
        return ret;
 }
@@ -836,7 +836,7 @@ void intel_lr_context_unpin(struct intel_engine_cs *ring,
 
        if (ctx_obj) {
                WARN_ON(!mutex_is_locked(&ring->dev->struct_mutex));
-               if (--ctx->engine[ring->id].unpin_count == 0) {
+               if (--ctx->engine[ring->id].pin_count == 0) {
                        intel_unpin_ringbuffer_obj(ringbuf);
                        i915_gem_object_ggtt_unpin(ctx_obj);
                }
@@ -1751,7 +1751,7 @@ void intel_lr_context_free(struct intel_context *ctx)
                                intel_unpin_ringbuffer_obj(ringbuf);
                                i915_gem_object_ggtt_unpin(ctx_obj);
                        }
-                       WARN_ON(ctx->engine[ring->id].unpin_count);
+                       WARN_ON(ctx->engine[ring->id].pin_count);
                        intel_destroy_ringbuffer_obj(ringbuf);
                        kfree(ringbuf);
                        drm_gem_object_unreference(&ctx_obj->base);