drm/i915: Mark up i915_gem_active for locking annotation

The future annotations will track the locking used for access to ensure
that it is always sufficient. We make the preparations now to present
the API ahead and to make sure that GCC can eliminate the unused
parameter.

Before:	6298417 3619610  696320 10614347         a1f64b vmlinux
After:	6298417 3619610  696320 10614347         a1f64b vmlinux
(with i915 builtin)

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470293567-10811-12-git-send-email-chris@chris-wilson.co.uk

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8c03d13d494d..d54a3ea56536 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11370,7 +11370,8 @@ static bool use_mmio_flip(struct intel_engine_cs *engine,
         if (resv && !reservation_object_test_signaled_rcu(resv, false))
                 return true;
 
-        return engine != i915_gem_active_get_engine(&obj->last_write);
+        return engine != i915_gem_active_get_engine(&obj->last_write,
+                                                    &obj->base.dev->struct_mutex);
 }
 
 static void skl_do_mmio_flip(struct intel_crtc *intel_crtc,
@@ -11673,7 +11674,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         } else if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) {
                 engine = &dev_priv->engine[BCS];
         } else if (INTEL_INFO(dev)->gen >= 7) {
-                engine = i915_gem_active_get_engine(&obj->last_write);
+                engine = i915_gem_active_get_engine(&obj->last_write,
+                                                    &obj->base.dev->struct_mutex);
                 if (engine == NULL || engine->id != RCS)
                         engine = &dev_priv->engine[BCS];
         } else {
@@ -11694,7 +11696,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         if (mmio_flip) {
                 INIT_WORK(&work->mmio_work, intel_mmio_flip_work_func);
 
-                work->flip_queued_req = i915_gem_active_get(&obj->last_write);
+                work->flip_queued_req = i915_gem_active_get(&obj->last_write,
+                                                            &obj->base.dev->struct_mutex);
                 schedule_work(&work->mmio_work);
         } else {
                 request = i915_gem_request_alloc(engine, engine->last_context);
@@ -14038,7 +14041,8 @@ intel_prepare_plane_fb(struct drm_plane *plane,
 
         if (ret == 0) {
                 to_intel_plane_state(new_state)->wait_req =
-                        i915_gem_active_get(&obj->last_write);
+                        i915_gem_active_get(&obj->last_write,
+                                            &obj->base.dev->struct_mutex);
         }
 
         return ret;