Rev 4246 | Rev 4293 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4246 | Rev 4280 | ||
|---|---|---|---|
| Line 24... | Line 24... | ||
| 24 | * Eric Anholt |
24 | * Eric Anholt |
| 25 | * |
25 | * |
| 26 | */ |
26 | */ |
| Line 27... | Line 27... | ||
| 27 | 27 | ||
| - | 28 | #include |
|
| 28 | #include |
29 | #include |
| 29 | #include |
30 | #include |
| 30 | #include "i915_drv.h" |
31 | #include "i915_drv.h" |
| 31 | #include "i915_trace.h" |
32 | #include "i915_trace.h" |
| 32 | #include "intel_drv.h" |
33 | #include "intel_drv.h" |
| Line 2617... | Line 2618... | ||
| 2617 | 2618 | ||
| 2618 | I915_WRITE(fence_reg + 4, val >> 32); |
2619 | I915_WRITE(fence_reg + 4, val >> 32); |
| Line 2619... | Line 2620... | ||
| 2619 | POSTING_READ(fence_reg + 4); |
2620 | POSTING_READ(fence_reg + 4); |
| - | 2621 | ||
| - | 2622 | I915_WRITE(fence_reg + 0, val); |
|
| - | 2623 | ||
| 2620 | 2624 | dbgprintf("%s val %x%x\n",__FUNCTION__, (int)(val >> 32), (int)val); |
|
| 2621 | I915_WRITE(fence_reg + 0, val); |
2625 | |
| 2622 | POSTING_READ(fence_reg); |
2626 | POSTING_READ(fence_reg); |
| 2623 | } else { |
2627 | } else { |
| 2624 | I915_WRITE(fence_reg + 4, 0); |
2628 | I915_WRITE(fence_reg + 4, 0); |
| Line 3666... | Line 3670... | ||
| 3666 | int ret; |
3670 | int ret; |
| Line 3667... | Line 3671... | ||
| 3667 | 3671 | ||
| 3668 | if (WARN_ON(obj->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT)) |
3672 | if (WARN_ON(obj->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT)) |
| Line 3669... | Line -... | ||
| 3669 | return -EBUSY; |
- | |
| 3670 | - | ||
| 3671 | // if( obj == get_fb_obj()) |
- | |
| 3672 | // return 0; |
3673 | return -EBUSY; |
| Line 3673... | Line 3674... | ||
| 3673 | 3674 | ||
| Line 3674... | Line 3675... | ||
| 3674 | WARN_ON(map_and_fenceable && !i915_is_ggtt(vm)); |
3675 | WARN_ON(map_and_fenceable && !i915_is_ggtt(vm)); |