Commit d72d908b authored by Chris Wilson's avatar Chris Wilson
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470293567-10811-12-git-send-email-chris@chris-wilson.co.uk
parent 27c01aae

drivers/gpu/drm/i915/i915_debugfs.c

+8 −4
Original line number Diff line number Diff line
@@ -155,10 +155,13 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) 
		   obj->base.write_domain);

	for_each_engine_id(engine, dev_priv, id)

		seq_printf(m, "%x ",

			   i915_gem_active_get_seqno(&obj->last_read[id]));

			   i915_gem_active_get_seqno(&obj->last_read[id],

						     &obj->base.dev->struct_mutex));

	seq_printf(m, "] %x %x%s%s%s",

		   i915_gem_active_get_seqno(&obj->last_write),

		   i915_gem_active_get_seqno(&obj->last_fence),

		   i915_gem_active_get_seqno(&obj->last_write,

					     &obj->base.dev->struct_mutex),

		   i915_gem_active_get_seqno(&obj->last_fence,

					     &obj->base.dev->struct_mutex),

		   i915_cache_level_str(to_i915(obj->base.dev), obj->cache_level),

		   obj->dirty ? " dirty" : "",

		   obj->madv == I915_MADV_DONTNEED ? " purgeable" : "");
@@ -196,7 +199,8 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) 
		seq_printf(m, " (%s mappable)", s);

	}



	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)

		seq_printf(m, " (%s)", engine->name);

drivers/gpu/drm/i915/i915_gem.c

+33 −16
Original line number Diff line number Diff line
@@ -1354,21 +1354,24 @@ i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj, 
	int ret, i;



	if (readonly) {

		request = i915_gem_active_peek(&obj->last_write);

		request = i915_gem_active_peek(&obj->last_write,

					       &obj->base.dev->struct_mutex);

		if (request) {

			ret = i915_wait_request(request);

			if (ret)

				return ret;



			i = request->engine->id;

			if (i915_gem_active_peek(&obj->last_read[i]) == request)

			if (i915_gem_active_peek(&obj->last_read[i],

						 &obj->base.dev->struct_mutex) == request)

				i915_gem_object_retire__read(obj, i);

			else

				i915_gem_object_retire__write(obj);

		}

	} else {

		for (i = 0; i < I915_NUM_ENGINES; i++) {

			request = i915_gem_active_peek(&obj->last_read[i]);

			request = i915_gem_active_peek(&obj->last_read[i],

						       &obj->base.dev->struct_mutex);

			if (!request)

				continue;
@@ -1400,9 +1403,11 @@ i915_gem_object_retire_request(struct drm_i915_gem_object *obj, 
{

	int idx = req->engine->id;



	if (i915_gem_active_peek(&obj->last_read[idx]) == req)

	if (i915_gem_active_peek(&obj->last_read[idx],

				 &obj->base.dev->struct_mutex) == req)

		i915_gem_object_retire__read(obj, idx);

	else if (i915_gem_active_peek(&obj->last_write) == req)

	else if (i915_gem_active_peek(&obj->last_write,

				      &obj->base.dev->struct_mutex) == req)

		i915_gem_object_retire__write(obj);



	if (!i915_reset_in_progress(&req->i915->gpu_error))
@@ -1431,7 +1436,8 @@ i915_gem_object_wait_rendering__nonblocking(struct drm_i915_gem_object *obj, 
	if (readonly) {

		struct drm_i915_gem_request *req;



		req = i915_gem_active_get(&obj->last_write);

		req = i915_gem_active_get(&obj->last_write,

					  &obj->base.dev->struct_mutex);

		if (req == NULL)

			return 0;
@@ -1440,7 +1446,8 @@ i915_gem_object_wait_rendering__nonblocking(struct drm_i915_gem_object *obj, 
		for (i = 0; i < I915_NUM_ENGINES; i++) {

			struct drm_i915_gem_request *req;



			req = i915_gem_active_get(&obj->last_read[i]);

			req = i915_gem_active_get(&obj->last_read[i],

						  &obj->base.dev->struct_mutex);

			if (req == NULL)

				continue;
@@ -2387,7 +2394,9 @@ static void 
i915_gem_object_retire__write(struct drm_i915_gem_object *obj)

{

	GEM_BUG_ON(!i915_gem_active_isset(&obj->last_write));

	GEM_BUG_ON(!(obj->active & intel_engine_flag(i915_gem_active_get_engine(&obj->last_write))));

	GEM_BUG_ON(!(obj->active &

		     intel_engine_flag(i915_gem_active_get_engine(&obj->last_write,

								  &obj->base.dev->struct_mutex))));



	i915_gem_active_set(&obj->last_write, NULL);

	intel_fb_obj_flush(obj, true, ORIGIN_CS);
@@ -2405,7 +2414,8 @@ i915_gem_object_retire__read(struct drm_i915_gem_object *obj, int idx) 
	list_del_init(&obj->engine_list[idx]);

	i915_gem_active_set(&obj->last_read[idx], NULL);



	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 && engine->id == idx)

		i915_gem_object_retire__write(obj);
@@ -2626,7 +2636,8 @@ i915_gem_retire_requests_ring(struct intel_engine_cs *engine) 
				       struct drm_i915_gem_object,

				       engine_list[engine->id]);



		if (!list_empty(&i915_gem_active_peek(&obj->last_read[engine->id])->list))

		if (!list_empty(&i915_gem_active_peek(&obj->last_read[engine->id],

						      &obj->base.dev->struct_mutex)->list))

			break;



		i915_gem_object_retire__read(obj, engine->id);
@@ -2759,7 +2770,8 @@ i915_gem_object_flush_active(struct drm_i915_gem_object *obj) 
	for (i = 0; i < I915_NUM_ENGINES; i++) {

		struct drm_i915_gem_request *req;



		req = i915_gem_active_peek(&obj->last_read[i]);

		req = i915_gem_active_peek(&obj->last_read[i],

					   &obj->base.dev->struct_mutex);

		if (req == NULL)

			continue;
@@ -2837,7 +2849,8 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	for (i = 0; i < I915_NUM_ENGINES; i++) {

		struct drm_i915_gem_request *req;



		req = i915_gem_active_get(&obj->last_read[i]);

		req = i915_gem_active_get(&obj->last_read[i],

					  &obj->base.dev->struct_mutex);

		if (req)

			requests[n++] = req;

	}
@@ -2932,14 +2945,16 @@ i915_gem_object_sync(struct drm_i915_gem_object *obj, 
	if (readonly) {

		struct drm_i915_gem_request *req;



		req = i915_gem_active_peek(&obj->last_write);

		req = i915_gem_active_peek(&obj->last_write,

					   &obj->base.dev->struct_mutex);

		if (req)

			requests[n++] = req;

	} else {

		for (i = 0; i < I915_NUM_ENGINES; i++) {

			struct drm_i915_gem_request *req;



			req = i915_gem_active_peek(&obj->last_read[i]);

			req = i915_gem_active_peek(&obj->last_read[i],

						   &obj->base.dev->struct_mutex);

			if (req)

				requests[n++] = req;

		}
@@ -4038,11 +4053,13 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, 
		int i;



		for (i = 0; i < I915_NUM_ENGINES; i++) {

			req = i915_gem_active_peek(&obj->last_read[i]);

			req = i915_gem_active_peek(&obj->last_read[i],

						   &obj->base.dev->struct_mutex);

			if (req)

				args->busy |= 1 << (16 + req->engine->exec_id);

		}

		req = i915_gem_active_peek(&obj->last_write);

		req = i915_gem_active_peek(&obj->last_write,

					   &obj->base.dev->struct_mutex);

		if (req)

			args->busy |= req->engine->exec_id;

	}

drivers/gpu/drm/i915/i915_gem_fence.c

+2 −1
Original line number Diff line number Diff line
@@ -263,7 +263,8 @@ i915_gem_object_wait_fence(struct drm_i915_gem_object *obj) 
{

	int ret;



	ret = i915_gem_active_wait(&obj->last_fence);

	ret = i915_gem_active_wait(&obj->last_fence,

				   &obj->base.dev->struct_mutex);

	if (ret)

		return ret;

drivers/gpu/drm/i915/i915_gem_request.h

+23 −13
Original line number Diff line number Diff line
@@ -296,6 +296,12 @@ i915_gem_active_set(struct i915_gem_active *active, 
	i915_gem_request_assign(&active->request, request);

}



static inline struct drm_i915_gem_request *

__i915_gem_active_peek(const struct i915_gem_active *active)

{

	return active->request;

}



/**

 * i915_gem_active_peek - report the request being monitored

 * @active - the active tracker
@@ -305,7 +311,7 @@ i915_gem_active_set(struct i915_gem_active *active, 
 * caller must hold struct_mutex.

 */

static inline struct drm_i915_gem_request *

i915_gem_active_peek(const struct i915_gem_active *active)

i915_gem_active_peek(const struct i915_gem_active *active, struct mutex *mutex)

{

	return active->request;

}
@@ -318,11 +324,11 @@ i915_gem_active_peek(const struct i915_gem_active *active) 
 * if the active tracker is idle. The caller must hold struct_mutex.

 */

static inline struct drm_i915_gem_request *

i915_gem_active_get(const struct i915_gem_active *active)

i915_gem_active_get(const struct i915_gem_active *active, struct mutex *mutex)

{

	struct drm_i915_gem_request *request;



	request = i915_gem_active_peek(active);

	request = i915_gem_active_peek(active, mutex);

	if (!request || i915_gem_request_completed(request))

		return NULL;
@@ -352,11 +358,12 @@ i915_gem_active_isset(const struct i915_gem_active *active) 
 * the caller to hold struct_mutex (but that can be relaxed if desired).

 */

static inline bool

i915_gem_active_is_idle(const struct i915_gem_active *active)

i915_gem_active_is_idle(const struct i915_gem_active *active,

			struct mutex *mutex)

{

	struct drm_i915_gem_request *request;



	request = i915_gem_active_peek(active);

	request = i915_gem_active_peek(active, mutex);

	if (!request || i915_gem_request_completed(request))

		return true;
@@ -372,11 +379,11 @@ i915_gem_active_is_idle(const struct i915_gem_active *active) 
 * retired first, see i915_gem_active_retire().

 */

static inline int __must_check

i915_gem_active_wait(const struct i915_gem_active *active)

i915_gem_active_wait(const struct i915_gem_active *active, struct mutex *mutex)

{

	struct drm_i915_gem_request *request;



	request = i915_gem_active_peek(active);

	request = i915_gem_active_peek(active, mutex);

	if (!request)

		return 0;
@@ -393,9 +400,10 @@ i915_gem_active_wait(const struct i915_gem_active *active) 
 * tracker is idle, the function returns immediately.

 */

static inline int __must_check

i915_gem_active_retire(const struct i915_gem_active *active)

i915_gem_active_retire(const struct i915_gem_active *active,

		       struct mutex *mutex)

{

	return i915_gem_active_wait(active);

	return i915_gem_active_wait(active, mutex);

}



/* Convenience functions for peeking at state inside active's request whilst
@@ -403,15 +411,17 @@ i915_gem_active_retire(const struct i915_gem_active *active) 
 */



static inline uint32_t

i915_gem_active_get_seqno(const struct i915_gem_active *active)

i915_gem_active_get_seqno(const struct i915_gem_active *active,

			  struct mutex *mutex)

{

	return i915_gem_request_get_seqno(i915_gem_active_peek(active));

	return i915_gem_request_get_seqno(i915_gem_active_peek(active, mutex));

}



static inline struct intel_engine_cs *

i915_gem_active_get_engine(const struct i915_gem_active *active)

i915_gem_active_get_engine(const struct i915_gem_active *active,

			   struct mutex *mutex)

{

	return i915_gem_request_get_engine(i915_gem_active_peek(active));

	return i915_gem_request_get_engine(i915_gem_active_peek(active, mutex));

}



#define for_each_active(mask, idx) \

drivers/gpu/drm/i915/i915_gem_tiling.c

+2 −1
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, 
			}



			obj->fence_dirty =

				!i915_gem_active_is_idle(&obj->last_fence) ||

				!i915_gem_active_is_idle(&obj->last_fence,

							 &dev->struct_mutex) ||

				obj->fence_reg != I915_FENCE_REG_NONE;



			obj->tiling_mode = args->tiling_mode;

CRA Git | Maintained and supported by SUSTech CRA and CCSE