diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-30 17:52:31 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-30 17:52:31 -0400 |
commit | ff75b9bc489710ff223bc0d805bf3b862dc347ea (patch) | |
tree | d0fc6f9e07a9bc65c70c03849f345799604ee8b9 /drivers/gpu/drm/i915/i915_gem.c | |
parent | add354ddf62beac55ca3ba64835dd703a0649867 (diff) |
drm/i915: Fix typo from e5281ccd in i915_gem_attach_phys_object()
Accessing the uninitialised obj->pages instead of the local page lead to
an OOPs.
Reported-by: Xavier Chantry <chantry.xavier@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 936ddd83f8a2..e3fc333e2e57 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -4925,7 +4925,7 @@ i915_gem_attach_phys_object(struct drm_device *dev, | |||
4925 | if (IS_ERR(page)) | 4925 | if (IS_ERR(page)) |
4926 | return PTR_ERR(page); | 4926 | return PTR_ERR(page); |
4927 | 4927 | ||
4928 | src = kmap_atomic(obj_priv->pages[i]); | 4928 | src = kmap_atomic(page); |
4929 | dst = obj_priv->phys_obj->handle->vaddr + (i * PAGE_SIZE); | 4929 | dst = obj_priv->phys_obj->handle->vaddr + (i * PAGE_SIZE); |
4930 | memcpy(dst, src, PAGE_SIZE); | 4930 | memcpy(dst, src, PAGE_SIZE); |
4931 | kunmap_atomic(src); | 4931 | kunmap_atomic(src); |