Rev 4293 | Rev 4389 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4293 | Rev 4371 | ||
---|---|---|---|
Line 680... | Line 680... | ||
680 | page_offset = offset_in_page(offset); |
680 | page_offset = offset_in_page(offset); |
681 | page_length = remain; |
681 | page_length = remain; |
682 | if ((page_offset + remain) > PAGE_SIZE) |
682 | if ((page_offset + remain) > PAGE_SIZE) |
683 | page_length = PAGE_SIZE - page_offset; |
683 | page_length = PAGE_SIZE - page_offset; |
Line 684... | Line 684... | ||
684 | 684 | ||
Line 685... | Line 685... | ||
685 | MapPage(vaddr, page_base, PG_SW|PG_NOCACHE); |
685 | MapPage(vaddr, dev_priv->gtt.mappable_base+page_base, PG_SW|PG_NOCACHE); |
Line 686... | Line 686... | ||
686 | 686 | ||
687 | memcpy(vaddr+page_offset, user_data, page_length); |
687 | memcpy(vaddr+page_offset, user_data, page_length); |
Line 714... | Line 714... | ||
714 | int ret = 0; |
714 | int ret = 0; |
Line 715... | Line 715... | ||
715 | 715 | ||
716 | if (unlikely(page_do_bit17_swizzling)) |
716 | if (unlikely(page_do_bit17_swizzling)) |
Line 717... | Line 717... | ||
717 | return -EINVAL; |
717 | return -EINVAL; |
718 | 718 | ||
719 | vaddr = (char *)MapIoMem((addr_t)page, 4096, PG_SW); |
719 | vaddr = (char *)MapIoMem((addr_t)page, 4096, PG_SW|PG_NOCACHE); |
720 | if (needs_clflush_before) |
720 | if (needs_clflush_before) |
721 | drm_clflush_virt_range(vaddr + shmem_page_offset, |
721 | drm_clflush_virt_range(vaddr + shmem_page_offset, |
722 | page_length); |
722 | page_length); |