Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next"
This reverts commit031e610a6a
, reversing changes made to52d2d44eee
. The mm changes in there we premature and not fully ack or reviewed by core mm folks, I dropped the ball by merging them via this tree, so lets take em all back out. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
@@ -172,6 +172,20 @@ vmw_validation_bo_reserve(struct vmw_validation_context *ctx,
|
||||
NULL, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* vmw_validation_bo_backoff - Unreserve buffer objects registered with a
|
||||
* validation context
|
||||
* @ctx: The validation context
|
||||
*
|
||||
* This function unreserves the buffer objects previously reserved using
|
||||
* vmw_validation_bo_reserve. It's typically used as part of an error path
|
||||
*/
|
||||
static inline void
|
||||
vmw_validation_bo_backoff(struct vmw_validation_context *ctx)
|
||||
{
|
||||
ttm_eu_backoff_reservation(&ctx->ticket, &ctx->bo_list);
|
||||
}
|
||||
|
||||
/**
|
||||
* vmw_validation_bo_fence - Unreserve and fence buffer objects registered
|
||||
* with a validation context
|
||||
@@ -254,6 +268,4 @@ int vmw_validation_preload_res(struct vmw_validation_context *ctx,
|
||||
unsigned int size);
|
||||
void vmw_validation_res_set_dirty(struct vmw_validation_context *ctx,
|
||||
void *val_private, u32 dirty);
|
||||
void vmw_validation_bo_backoff(struct vmw_validation_context *ctx);
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user