diff options
| author | Tejun Heo <tj@kernel.org> | 2021-05-24 13:43:56 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2021-05-24 13:43:56 -0400 |
| commit | c2a11971549b16a24cce81250d84b63d53499fd0 (patch) | |
| tree | 7bfa4b1c61ec5ad44834a3e38da3d4958517a00f /drivers/gpu/drm/i915/display/intel_overlay.c | |
| parent | f4f809f66b7545b89bff4b132cdb37adc2d2c157 (diff) | |
| parent | 08b2b6fdf6b26032f025084ce2893924a0cdb4a2 (diff) | |
Merge branch 'for-5.13-fixes' into for-5.14
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_overlay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c index e5dadde422f7..bbaf05515e88 100644 --- 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 = |