提交 7032361a 编写于 作者: T Tvrtko Ursulin 提交者: Zheng Zengkai

drm/i915/overlay: Fix active retire callback alignment

stable inclusion
from stable-5.10.38
commit cd47b861d2251235f5e2ef6a31930d71c147c387
bugzilla: 51875
CVE: NA

--------------------------------

commit a915fe5e upstream.

__i915_active_call annotation is required on the retire callback to ensure
correct function alignment.
Signed-off-by: NTvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: a21ce8ad ("drm/i915/overlay: Switch to using i915_active tracking")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210429083530.849546-1-tvrtko.ursulin@linux.intel.com
(cherry picked from commit d8e44e4d)
Signed-off-by: NJani Nikula <jani.nikula@intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 a01a5c56
...@@ -382,7 +382,7 @@ static void intel_overlay_off_tail(struct intel_overlay *overlay) ...@@ -382,7 +382,7 @@ static void intel_overlay_off_tail(struct intel_overlay *overlay)
i830_overlay_clock_gating(dev_priv, true); i830_overlay_clock_gating(dev_priv, true);
} }
static void __i915_active_call static void
intel_overlay_last_flip_retire(struct i915_active *active) intel_overlay_last_flip_retire(struct i915_active *active)
{ {
struct intel_overlay *overlay = struct intel_overlay *overlay =
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册