From f0ca820cc0067ce4debd9893650e5c188c83b941 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 26 Jun 2019 00:33:49 +0100
Subject: drm/i915/gt: Always call kref_init for the timeline
Git-commit: f0ca820cc0067ce4debd9893650e5c188c83b941
Patch-mainline: v5.4-rc1
References: bsc#1152489
Always initialise the refcount, even for the embedded timelines inside
mock devices.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190625233349.32371-2-chris@chris-wilson.co.uk
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/i915/gt/intel_timeline.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c b/drivers/gpu/drm/i915/gt/intel_timeline.c
index 3bbb632cb535..6daa9eb59e19 100644
--- a/drivers/gpu/drm/i915/gt/intel_timeline.c
+++ b/drivers/gpu/drm/i915/gt/intel_timeline.c
@@ -210,8 +210,11 @@ int intel_timeline_init(struct intel_timeline *timeline,
{
void *vaddr;
+ kref_init(&timeline->kref);
+
timeline->gt = gt;
timeline->pin_count = 0;
+
timeline->has_initial_breadcrumb = !hwsp;
timeline->hwsp_cacheline = NULL;
@@ -357,8 +360,6 @@ intel_timeline_create(struct intel_gt *gt, struct i915_vma *global_hwsp)
return ERR_PTR(err);
}
- kref_init(&timeline->kref);
-
return timeline;
}
--
2.28.0