drm/i915/display: Move releasing gem object away from fb tracking

[ Upstream commit 501069dad5214fafe1b8ba38fa26a5d07df784c3 ]

As a preparation for Xe we want to remove all i915_gem_object details away
from frontbuffer tacking code. Due to this move releasing gem object
reference to i915_gem_object_set_frontbuffer.

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231012072158.4115795-2-jouni.hogander@intel.com
Stable-dep-of: 560ea72c76eb ("drm/i915/dp_mst: Fix race between connector registration and setup")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
index ec46716b2f49ec25fc5b8cf6ce2df12c7467487b..2ea37c0414a9585418d09a6c84b90c3bcb5f5ffc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@ -265,8 +265,6 @@ static void frontbuffer_release(struct kref *ref)
        spin_unlock(&intel_bo_to_i915(obj)->display.fb_tracking.lock);
 
        i915_active_fini(&front->write);
-
-       i915_gem_object_put(obj);
        kfree_rcu(front, rcu);
 }
 

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h b/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h
index e5e870b6f186c90a2fe9f30ecfc3b6ab931af07f..9fbf14867a2a6404228c7bbd96b256314172e1cf 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h
@@ -89,6 +89,7 @@ i915_gem_object_set_frontbuffer(struct drm_i915_gem_object *obj,
 
        if (!front) {
                RCU_INIT_POINTER(obj->frontbuffer, NULL);
+               drm_gem_object_put(intel_bo_to_drm_bo(obj));
        } else if (rcu_access_pointer(obj->frontbuffer)) {
                cur = rcu_dereference_protected(obj->frontbuffer, true);
                kref_get(&cur->ref);