| From a915fe5e9601c632417ef5261af70788d7d23a8a Mon Sep 17 00:00:00 2001 |
| From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> |
| Date: Thu, 29 Apr 2021 09:35:29 +0100 |
| Subject: drm/i915/overlay: Fix active retire callback alignment |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> |
| |
| commit a915fe5e9601c632417ef5261af70788d7d23a8a upstream. |
| |
| __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: a21ce8ad12d2 ("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 d8e44e4dd221ee283ea60a6fb87bca08807aa0ab) |
| Signed-off-by: Jani Nikula <jani.nikula@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/i915/display/intel_overlay.c |
| +++ b/drivers/gpu/drm/i915/display/intel_overlay.c |
| @@ -382,7 +382,7 @@ static void intel_overlay_off_tail(struc |
| 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 = |
