Subversion Repositories Kolibri OS

Rev

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

Rev 6296 Rev 6935
Line 30... Line 30...
30 
#include
30 
#include
31 
#include "i915_drv.h"
 31 
#include "i915_drv.h"
32 
#include "i915_trace.h"
 32 
#include "i915_trace.h"
33 
#include "intel_drv.h"
 33 
#include "intel_drv.h"
34 
#include
34 
#include
- 
 
 35 
#include
Line 35... Line 36...
35 
 
 36 
 
36 
#define  __EXEC_OBJECT_HAS_PIN (1<<31)
 37 
#define  __EXEC_OBJECT_HAS_PIN (1<<31)
37 
#define  __EXEC_OBJECT_HAS_FENCE (1<<30)
 38 
#define  __EXEC_OBJECT_HAS_FENCE (1<<30)
38 
#define  __EXEC_OBJECT_NEEDS_MAP (1<<29)
 39 
#define  __EXEC_OBJECT_NEEDS_MAP (1<<29)
Line 539... Line 540...
539 
	 * contained within a mmaped bo. For in such a case we, the page
 540 
	 * contained within a mmaped bo. For in such a case we, the page
540 
	 * fault handler would call i915_gem_fault() and we would try to
 541 
	 * fault handler would call i915_gem_fault() and we would try to
541 
	 * acquire the struct mutex again. Obviously this is bad and so
 542 
	 * acquire the struct mutex again. Obviously this is bad and so
542 
	 * lockdep complains vehemently.
 543 
	 * lockdep complains vehemently.
543 
	 */
 544 
	 */
544 
//	pagefault_disable();
 545 
	pagefault_disable();
545 
	list_for_each_entry(vma, &eb->vmas, exec_list) {
 546 
	list_for_each_entry(vma, &eb->vmas, exec_list) {
546 
		ret = i915_gem_execbuffer_relocate_vma(vma, eb);
 547 
		ret = i915_gem_execbuffer_relocate_vma(vma, eb);
547 
		if (ret)
 548 
		if (ret)
548 
			break;
 549 
			break;
549 
	}
 550 
	}
550 
//   pagefault_enable();
 551 
	pagefault_enable();
Line 551... Line 552...
551 
 
 552 
 
552 
	return ret;
 553 
	return ret;
Line 553... Line 554...
553 
}
 554 
}