Rev 3480 | Rev 3746 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3480 | Rev 3482 | ||
---|---|---|---|
Line 265... | Line 265... | ||
265 | /* drop reference from allocate - handle holds it now */ |
265 | /* drop reference from allocate - handle holds it now */ |
266 | drm_gem_object_unreference(&obj->base); |
266 | drm_gem_object_unreference(&obj->base); |
267 | trace_i915_gem_object_create(obj); |
267 | trace_i915_gem_object_create(obj); |
Line 268... | Line 268... | ||
268 | 268 | ||
269 | *handle_p = handle; |
- | |
270 | - | ||
271 | // printf("%s obj %p handle %d\n", __FUNCTION__, obj, handle); |
- | |
272 | 269 | *handle_p = handle; |
|
273 | return 0; |
270 | return 0; |
Line 274... | Line 271... | ||
274 | } |
271 | } |
275 | 272 | ||
Line 692... | Line 689... | ||
692 | FreeKernelSpace(vaddr); |
689 | FreeKernelSpace(vaddr); |
Line 693... | Line 690... | ||
693 | 690 | ||
694 | out_unpin: |
691 | out_unpin: |
695 | i915_gem_object_unpin(obj); |
692 | i915_gem_object_unpin(obj); |
696 | out: |
- | |
697 | printf("% s ret = %d\n", __FUNCTION__, ret); |
- | |
698 | 693 | out: |
|
699 | return ret; |
694 | return ret; |
Line 700... | Line 695... | ||
700 | } |
695 | } |
701 | 696 | ||
Line 1947... | Line 1942... | ||
1947 | // jiffies + |
1942 | // jiffies + |
1948 | // msecs_to_jiffies(DRM_I915_HANGCHECK_PERIOD)); |
1943 | // msecs_to_jiffies(DRM_I915_HANGCHECK_PERIOD)); |
1949 | } |
1944 | } |
1950 | if (was_empty) { |
1945 | if (was_empty) { |
1951 | queue_delayed_work(dev_priv->wq, |
1946 | queue_delayed_work(dev_priv->wq, |
1952 | &dev_priv->mm.retire_work, HZ); |
1947 | &dev_priv->mm.retire_work, |
- | 1948 | round_jiffies_up_relative(HZ)); |
|
1953 | intel_mark_busy(dev_priv->dev); |
1949 | intel_mark_busy(dev_priv->dev); |
1954 | } |
1950 | } |
1955 | } |
1951 | } |
Line 1956... | Line 1952... | ||
1956 | 1952 | ||
Line 2133... | Line 2129... | ||
2133 | mm.retire_work.work); |
2129 | mm.retire_work.work); |
2134 | dev = dev_priv->dev; |
2130 | dev = dev_priv->dev; |
Line 2135... | Line 2131... | ||
2135 | 2131 | ||
2136 | /* Come back later if the device is busy... */ |
2132 | /* Come back later if the device is busy... */ |
2137 | if (!mutex_trylock(&dev->struct_mutex)) { |
2133 | if (!mutex_trylock(&dev->struct_mutex)) { |
- | 2134 | queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, |
|
2138 | queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ); |
2135 | round_jiffies_up_relative(HZ)); |
2139 | return; |
2136 | return; |
Line 2140... | Line 2137... | ||
2140 | } |
2137 | } |
Line 2151... | Line 2148... | ||
2151 | 2148 | ||
2152 | idle &= list_empty(&ring->request_list); |
2149 | idle &= list_empty(&ring->request_list); |
Line 2153... | Line 2150... | ||
2153 | } |
2150 | } |
2154 | 2151 | ||
- | 2152 | if (!dev_priv->mm.suspended && !idle) |
|
2155 | if (!dev_priv->mm.suspended && !idle) |
2153 | queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, |
2156 | queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ); |
2154 | round_jiffies_up_relative(HZ)); |
Line 2157... | Line 2155... | ||
2157 | if (idle) |
2155 | if (idle) |
2158 | intel_mark_idle(dev); |
2156 | intel_mark_idle(dev); |