Rev 2351 | Rev 2360 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2351 | Rev 2352 | ||
---|---|---|---|
Line 208... | Line 208... | ||
208 | 208 | ||
Line 209... | Line 209... | ||
209 | obj = i915_gem_alloc_object(dev, 4096); |
209 | obj = i915_gem_alloc_object(dev, 4096); |
210 | i915_gem_object_pin(obj, 4096, true); |
210 | i915_gem_object_pin(obj, 4096, true); |
Line 211... | Line 211... | ||
211 | 211 | ||
212 | cmd_buffer = MapIoMem(obj->pages[0], 4096, PG_SW|PG_NOCACHE); |
212 | cmd_buffer = MapIoMem((addr_t)obj->pages[0], 4096, PG_SW|PG_NOCACHE); |
213 | cmd_offset = obj->gtt_offset; |
213 | cmd_offset = obj->gtt_offset; |
214 | }; |
214 | }; |
Line 215... | Line 215... | ||
215 | #endif |
215 | #endif |
Line 575... | Line 575... | ||
575 | 575 | ||
Line 576... | Line 576... | ||
576 | if (!dev_priv->info->cursor_needs_physical) |
576 | if (!dev_priv->info->cursor_needs_physical) |
577 | intel_crtc->cursor_addr = cursor->cobj->gtt_offset; |
577 | intel_crtc->cursor_addr = cursor->cobj->gtt_offset; |
578 | else |
578 | else |
579 | intel_crtc->cursor_addr = cursor->cobj; |
579 | intel_crtc->cursor_addr = (addr_t)cursor->cobj; |
Line 580... | Line 580... | ||
580 | 580 | ||
581 | intel_crtc->cursor_width = 32; |
581 | intel_crtc->cursor_width = 32; |
Line 582... | Line 582... | ||
582 | intel_crtc->cursor_height = 32; |
582 | intel_crtc->cursor_height = 32; |
Line 1001... | Line 1001... | ||
1001 | 1001 | ||
Line 1002... | Line 1002... | ||
1002 | dst_x+= winrc.left; |
1002 | dst_x+= winrc.left; |
1003 | dst_y+= winrc.top; |
1003 | dst_y+= winrc.top; |
Line 1004... | Line -... | ||
1004 | - | ||
1005 | i915_gem_object_set_to_gtt_domain(src_bitmap->obj, false); |
- | |
1006 | 1004 | ||
Line 1007... | Line -... | ||
1007 | sna_blit_copy(dst_bitmap, dst_x, dst_y, w, h, src_bitmap, src_x, src_y); |
- | |
1008 | - | ||
1009 | src_bitmap->obj->base.read_domains = I915_GEM_DOMAIN_CPU; |
- | |
1010 | src_bitmap->obj->base.write_domain = I915_GEM_DOMAIN_CPU; |
1005 | sna_blit_copy(dst_bitmap, dst_x, dst_y, w, h, src_bitmap, src_x, src_y); |