drm/i915/overlay: Fix active retire callback alignment

tursulin · jnikula · commit a915fe5e9601 · 2021-05-12T20:52:59.000+03:00
__i915_active_call annotation is required on the retire callback to ensure correct function alignment. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Fixes: a21ce8a ("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: Ville 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 d8e44e4) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -383,7 +383,7 @@ static void intel_overlay_off_tail(struct intel_overlay *overlay)
 		i830_overlay_clock_gating(dev_priv, true);
 }
 
-static void
+__i915_active_call static void
 intel_overlay_last_flip_retire(struct i915_active *active)
 {
 	struct intel_overlay *overlay =

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ static void intel_overlay_off_tail(struct intel_overlay *overlay)`
`383`	`383`	`i830_overlay_clock_gating(dev_priv, true);`
`384`	`384`	`}`
`385`	`385`
`386`		`-static void`
	`386`	`+__i915_active_call static void`
`387`	`387`	`intel_overlay_last_flip_retire(struct i915_active *active)`
`388`	`388`	`{`
`389`	`389`	`struct intel_overlay *overlay =`