Rev 4371 | Rev 4560 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4371 | Rev 4539 | ||
---|---|---|---|
Line 481... | Line 481... | ||
481 | ret = i915_gem_obj_ggtt_pin(ring->scratch.obj, 4096, true, false); |
481 | ret = i915_gem_obj_ggtt_pin(ring->scratch.obj, 4096, true, false); |
482 | if (ret) |
482 | if (ret) |
483 | goto err_unref; |
483 | goto err_unref; |
Line 484... | Line 484... | ||
484 | 484 | ||
485 | ring->scratch.gtt_offset = i915_gem_obj_ggtt_offset(ring->scratch.obj); |
485 | ring->scratch.gtt_offset = i915_gem_obj_ggtt_offset(ring->scratch.obj); |
486 | ring->scratch.cpu_page = (void*)MapIoMem((addr_t)sg_page(ring->scratch.obj->pages->sgl),4096, PG_SW); |
486 | ring->scratch.cpu_page = (void*)MapIoMem((addr_t)sg_page(ring->scratch.obj->pages->sgl),4096, PG_SW|0x100); |
487 | if (ring->scratch.cpu_page == NULL) { |
487 | if (ring->scratch.cpu_page == NULL) { |
488 | ret = -ENOMEM; |
488 | ret = -ENOMEM; |
489 | goto err_unpin; |
489 | goto err_unpin; |
Line 1180... | Line 1180... | ||
1180 | if (ret != 0) { |
1180 | if (ret != 0) { |
1181 | goto err_unref; |
1181 | goto err_unref; |
1182 | } |
1182 | } |
Line 1183... | Line 1183... | ||
1183 | 1183 | ||
1184 | ring->status_page.gfx_addr = i915_gem_obj_ggtt_offset(obj); |
1184 | ring->status_page.gfx_addr = i915_gem_obj_ggtt_offset(obj); |
1185 | ring->status_page.page_addr = (void*)MapIoMem((addr_t)sg_page(obj->pages->sgl),4096,PG_SW); |
1185 | ring->status_page.page_addr = (void*)MapIoMem((addr_t)sg_page(obj->pages->sgl),4096,PG_SW|0x100); |
1186 | if (ring->status_page.page_addr == NULL) { |
1186 | if (ring->status_page.page_addr == NULL) { |
1187 | ret = -ENOMEM; |
1187 | ret = -ENOMEM; |
1188 | goto err_unpin; |
1188 | goto err_unpin; |
1189 | } |
1189 | } |