Subversion Repositories Kolibri OS

Rev

Rev 4569 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4569 Rev 5078
Line 699... Line 699...
699 
	wait_timeout = (wait_timeout >> 20) + (wait_timeout >> 24) -
 699 
	wait_timeout = (wait_timeout >> 20) + (wait_timeout >> 24) -
700 
	  (wait_timeout >> 26);
 700 
	  (wait_timeout >> 26);
Line 701... Line 701...
701 
 
 701 
 
702 
	if (!arg->cookie_valid) {
 702 
	if (!arg->cookie_valid) {
703 
		arg->cookie_valid = 1;
 703 
		arg->cookie_valid = 1;
704 
        arg->kernel_cookie = GetTimerTicks() + wait_timeout;
 704 
		arg->kernel_cookie = jiffies + wait_timeout;
Line 705... Line 705...
705 
	}
 705 
	}
706 
 
 706 
 
707 
	base = ttm_base_object_lookup(tfile, arg->handle);
 707 
	base = ttm_base_object_lookup(tfile, arg->handle);
Line 712... Line 712...
712 
		return -EINVAL;
 712 
		return -EINVAL;
713 
	}
 713 
	}
Line 714... Line 714...
714 
 
 714 
 
Line 715... Line 715...
715 
	fence = &(container_of(base, struct vmw_user_fence, base)->fence);
 715 
	fence = &(container_of(base, struct vmw_user_fence, base)->fence);
716 
 
 716 
 
717 
    timeout = GetTimerTicks();
 717 
	timeout = jiffies;
718 
	if (time_after_eq(timeout, (unsigned long)arg->kernel_cookie)) {
 718 
	if (time_after_eq(timeout, (unsigned long)arg->kernel_cookie)) {
719 
		ret = ((vmw_fence_obj_signaled(fence, arg->flags)) ?
 719 
		ret = ((vmw_fence_obj_signaled(fence, arg->flags)) ?
720 
		       0 : -EBUSY);
 720 
		       0 : -EBUSY);