Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228677
b: refs/heads/master
c: ff75b9b
h: refs/heads/master
i:
  228675: 69d3d14
v: v3
  • Loading branch information
Chris Wilson committed Oct 30, 2010
1 parent 391576a commit 76c094d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: add354ddf62beac55ca3ba64835dd703a0649867
refs/heads/master: ff75b9bc489710ff223bc0d805bf3b862dc347ea
2 changes: 1 addition & 1 deletion trunk/drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -4925,7 +4925,7 @@ i915_gem_attach_phys_object(struct drm_device *dev,
if (IS_ERR(page))
return PTR_ERR(page);

src = kmap_atomic(obj_priv->pages[i]);
src = kmap_atomic(page);
dst = obj_priv->phys_obj->handle->vaddr + (i * PAGE_SIZE);
memcpy(dst, src, PAGE_SIZE);
kunmap_atomic(src);
Expand Down

0 comments on commit 76c094d

Please sign in to comment.