Rev 4104 | Rev 5060 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4104 | Rev 4560 | ||
|---|---|---|---|
| Line 248... | Line 248... | ||
| 248 | kfree(st); |
248 | kfree(st); |
| 249 | return NULL; |
249 | return NULL; |
| 250 | } |
250 | } |
| Line 251... | Line 251... | ||
| 251 | 251 | ||
| 252 | sg = st->sgl; |
252 | sg = st->sgl; |
| 253 | sg->offset = offset; |
253 | sg->offset = 0; |
| Line 254... | Line 254... | ||
| 254 | sg->length = size; |
254 | sg->length = size; |
| 255 | 255 | ||
| Line 393... | Line 393... | ||
| 393 | 393 | ||
| 394 | /* Some objects just need physical mem from stolen space */ |
394 | /* Some objects just need physical mem from stolen space */ |
| 395 | if (gtt_offset == I915_GTT_OFFSET_NONE) |
395 | if (gtt_offset == I915_GTT_OFFSET_NONE) |
| Line 396... | Line 396... | ||
| 396 | return obj; |
396 | return obj; |
| 397 | 397 | ||
| 398 | vma = i915_gem_vma_create(obj, ggtt); |
398 | vma = i915_gem_obj_lookup_or_create_vma(obj, ggtt); |
| 399 | if (IS_ERR(vma)) { |
399 | if (IS_ERR(vma)) { |
| 400 | ret = PTR_ERR(vma); |
400 | ret = PTR_ERR(vma); |
| Line 418... | Line 418... | ||
| 418 | 418 | ||
| Line 419... | Line 419... | ||
| 419 | obj->has_global_gtt_mapping = 1; |
419 | obj->has_global_gtt_mapping = 1; |
| 420 | 420 | ||
| - | 421 | list_add_tail(&obj->global_list, &dev_priv->mm.bound_list); |
|
| Line 421... | Line 422... | ||
| 421 | list_add_tail(&obj->global_list, &dev_priv->mm.bound_list); |
422 | list_add_tail(&vma->mm_list, &ggtt->inactive_list); |
| Line 422... | Line 423... | ||
| 422 | list_add_tail(&vma->mm_list, &ggtt->inactive_list); |
423 | i915_gem_object_pin_pages(obj); |
| 423 | 424 | ||