projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next
[linux-block.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_dmem.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_dmem.c
b/drivers/gpu/drm/nouveau/nouveau_dmem.c
index e5c230d9ae24ed2ccca95c4d25c6765ef26beca0..af870671195a83264bff21ca07261ac7f0f14c9b 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_dmem.c
@@
-100,7
+100,7
@@
unsigned long nouveau_dmem_page_addr(struct page *page)
unsigned long off = (page_to_pfn(page) << PAGE_SHIFT) -
chunk->pagemap.res.start;
- return chunk->bo->
bo.
offset + off;
+ return chunk->bo->offset + off;
}
static void nouveau_dmem_page_free(struct page *page)