Commit a9d0eb95 authored by Jouni Högander's avatar Jouni Högander

drm/i915: Warn on if set frontbuffer return value is not NULL on release

i915_gem_object_set_frontbuffer returns set frontbuffer pointer.  When we
are releasing frontbuffer we are clearing the pointer from the object. Warn
on if return value is not null.

v3: Check i915_gem_object_set_frontbuffer return value separately
v2: Instead of ignoring do drm_WARN_ON

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarJouni Högander <jouni.hogander@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230928082924.164720-1-jouni.hogander@intel.com
parent f67ff36f
...@@ -251,7 +251,7 @@ static void frontbuffer_retire(struct i915_active *ref) ...@@ -251,7 +251,7 @@ static void frontbuffer_retire(struct i915_active *ref)
static void frontbuffer_release(struct kref *ref) static void frontbuffer_release(struct kref *ref)
__releases(&intel_bo_to_i915(front->obj)->display.fb_tracking.lock) __releases(&intel_bo_to_i915(front->obj)->display.fb_tracking.lock)
{ {
struct intel_frontbuffer *front = struct intel_frontbuffer *ret, *front =
container_of(ref, typeof(*front), ref); container_of(ref, typeof(*front), ref);
struct drm_i915_gem_object *obj = front->obj; struct drm_i915_gem_object *obj = front->obj;
...@@ -259,7 +259,8 @@ static void frontbuffer_release(struct kref *ref) ...@@ -259,7 +259,8 @@ static void frontbuffer_release(struct kref *ref)
i915_ggtt_clear_scanout(obj); i915_ggtt_clear_scanout(obj);
i915_gem_object_set_frontbuffer(obj, NULL); ret = i915_gem_object_set_frontbuffer(obj, NULL);
drm_WARN_ON(&intel_bo_to_i915(obj)->drm, ret);
spin_unlock(&intel_bo_to_i915(obj)->display.fb_tracking.lock); spin_unlock(&intel_bo_to_i915(obj)->display.fb_tracking.lock);
i915_active_fini(&front->write); i915_active_fini(&front->write);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment