diff options
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.c')
-rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index cd06cfd94687..d8bc59c7e261 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c | |||
@@ -225,16 +225,14 @@ int msm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
225 | } | 225 | } |
226 | 226 | ||
227 | /* We don't use vmf->pgoff since that has the fake offset: */ | 227 | /* We don't use vmf->pgoff since that has the fake offset: */ |
228 | pgoff = ((unsigned long)vmf->virtual_address - | 228 | pgoff = (vmf->address - vma->vm_start) >> PAGE_SHIFT; |
229 | vma->vm_start) >> PAGE_SHIFT; | ||
230 | 229 | ||
231 | pfn = page_to_pfn(pages[pgoff]); | 230 | pfn = page_to_pfn(pages[pgoff]); |
232 | 231 | ||
233 | VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address, | 232 | VERB("Inserting %p pfn %lx, pa %lx", (void *)vmf->address, |
234 | pfn, pfn << PAGE_SHIFT); | 233 | pfn, pfn << PAGE_SHIFT); |
235 | 234 | ||
236 | ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address, | 235 | ret = vm_insert_mixed(vma, vmf->address, __pfn_to_pfn_t(pfn, PFN_DEV)); |
237 | __pfn_to_pfn_t(pfn, PFN_DEV)); | ||
238 | 236 | ||
239 | out_unlock: | 237 | out_unlock: |
240 | mutex_unlock(&dev->struct_mutex); | 238 | mutex_unlock(&dev->struct_mutex); |