diff options
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_sgdma.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_agp_backend.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index 288bacac7e5a..edc140ab4df1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c | |||
@@ -20,7 +20,8 @@ struct nouveau_sgdma_be { | |||
20 | 20 | ||
21 | static int | 21 | static int |
22 | nouveau_sgdma_populate(struct ttm_backend *be, unsigned long num_pages, | 22 | nouveau_sgdma_populate(struct ttm_backend *be, unsigned long num_pages, |
23 | struct page **pages, struct page *dummy_read_page) | 23 | struct page **pages, struct page *dummy_read_page, |
24 | dma_addr_t *dma_addrs) | ||
24 | { | 25 | { |
25 | struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be; | 26 | struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)be; |
26 | struct drm_device *dev = nvbe->dev; | 27 | struct drm_device *dev = nvbe->dev; |
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 01c2c736a1da..6f156e9d3f31 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c | |||
@@ -655,7 +655,8 @@ struct radeon_ttm_backend { | |||
655 | static int radeon_ttm_backend_populate(struct ttm_backend *backend, | 655 | static int radeon_ttm_backend_populate(struct ttm_backend *backend, |
656 | unsigned long num_pages, | 656 | unsigned long num_pages, |
657 | struct page **pages, | 657 | struct page **pages, |
658 | struct page *dummy_read_page) | 658 | struct page *dummy_read_page, |
659 | dma_addr_t *dma_addrs) | ||
659 | { | 660 | { |
660 | struct radeon_ttm_backend *gtt; | 661 | struct radeon_ttm_backend *gtt; |
661 | 662 | ||
diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c index f999e36f30b4..1c4a72f681c1 100644 --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c | |||
@@ -47,7 +47,8 @@ struct ttm_agp_backend { | |||
47 | 47 | ||
48 | static int ttm_agp_populate(struct ttm_backend *backend, | 48 | static int ttm_agp_populate(struct ttm_backend *backend, |
49 | unsigned long num_pages, struct page **pages, | 49 | unsigned long num_pages, struct page **pages, |
50 | struct page *dummy_read_page) | 50 | struct page *dummy_read_page, |
51 | dma_addr_t *dma_addrs) | ||
51 | { | 52 | { |
52 | struct ttm_agp_backend *agp_be = | 53 | struct ttm_agp_backend *agp_be = |
53 | container_of(backend, struct ttm_agp_backend, backend); | 54 | container_of(backend, struct ttm_agp_backend, backend); |
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 0d39001259fb..86d5b1745a45 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c | |||
@@ -169,7 +169,7 @@ int ttm_tt_populate(struct ttm_tt *ttm) | |||
169 | } | 169 | } |
170 | 170 | ||
171 | be->func->populate(be, ttm->num_pages, ttm->pages, | 171 | be->func->populate(be, ttm->num_pages, ttm->pages, |
172 | ttm->dummy_read_page); | 172 | ttm->dummy_read_page, ttm->dma_address); |
173 | ttm->state = tt_unbound; | 173 | ttm->state = tt_unbound; |
174 | return 0; | 174 | return 0; |
175 | } | 175 | } |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c index 80bc37b274e7..87e43e0733bf 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | |||
@@ -102,7 +102,8 @@ struct vmw_ttm_backend { | |||
102 | 102 | ||
103 | static int vmw_ttm_populate(struct ttm_backend *backend, | 103 | static int vmw_ttm_populate(struct ttm_backend *backend, |
104 | unsigned long num_pages, struct page **pages, | 104 | unsigned long num_pages, struct page **pages, |
105 | struct page *dummy_read_page) | 105 | struct page *dummy_read_page, |
106 | dma_addr_t *dma_addrs) | ||
106 | { | 107 | { |
107 | struct vmw_ttm_backend *vmw_be = | 108 | struct vmw_ttm_backend *vmw_be = |
108 | container_of(backend, struct vmw_ttm_backend, backend); | 109 | container_of(backend, struct vmw_ttm_backend, backend); |