Skip to content

Commit

Permalink
drm/i915: Clip the partial view against the object not vma
Browse files Browse the repository at this point in the history
The VMA is later clipped against the vm_area_struct before insertion of
the faulting PTE so we are free to create the partial view as we desire.
If we use the object as the extents rather than the area, this partial
can then be used for other areas.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170110095633.6612-2-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Jan 10, 2017
1 parent 2d4281b commit 8201c1f
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,6 @@ int i915_gem_mmap_gtt_version(void)

static inline struct i915_ggtt_view
compute_partial_view(struct drm_i915_gem_object *obj,
struct vm_area_struct *area,
pgoff_t page_offset,
unsigned int chunk)
{
Expand All @@ -1765,7 +1764,7 @@ compute_partial_view(struct drm_i915_gem_object *obj,
view.params.partial.offset = rounddown(page_offset, chunk);
view.params.partial.size =
min_t(unsigned int, chunk,
vma_pages(area) - view.params.partial.offset);
(obj->base.size >> PAGE_SHIFT) - view.params.partial.offset);

/* If the partial covers the entire object, just create a normal VMA. */
if (chunk >= obj->base.size >> PAGE_SHIFT)
Expand Down Expand Up @@ -1852,8 +1851,7 @@ int i915_gem_fault(struct vm_area_struct *area, struct vm_fault *vmf)
if (IS_ERR(vma)) {
/* Use a partial view if it is bigger than available space */
struct i915_ggtt_view view =
compute_partial_view(obj, area,
page_offset, MIN_CHUNK_PAGES);
compute_partial_view(obj, page_offset, MIN_CHUNK_PAGES);

/* Userspace is now writing through an untracked VMA, abandon
* all hope that the hardware is able to track future writes.
Expand Down

0 comments on commit 8201c1f

Please sign in to comment.