drivers/gpu/drm/openchrome/via_drv.h | 7 ++++---
drivers/gpu/drm/openchrome/via_ioc32.c | 3 ---
drivers/gpu/drm/openchrome/via_sgdma.c | 7 +++----
drivers/gpu/drm/openchrome/via_ttm.c | 19 ++++++++-----------
4 files changed, 15 insertions(+), 21 deletions(-)
New commits:
commit f5fd7fe7c2780b607d9185be0eb1f42cf7915153
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Apr 3 20:38:59 2018 -0700
drm/openchrome: Remove read_domains and write_domain from drm_gem_object
Refer to commit c0a51fd.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_ioc32.c
b/drivers/gpu/drm/openchrome/via_ioc32.c
index b84ed22b944f..f3a335a1ac57 100644
--- a/drivers/gpu/drm/openchrome/via_ioc32.c
+++ b/drivers/gpu/drm/openchrome/via_ioc32.c
@@ -81,7 +81,6 @@ via_gem_alloc(struct drm_device *dev, void *data,
args->offset = bo->offset;
args->size = bo->mem.size;
args->version = 1;
- obj->read_domains = obj->write_domain = args->domains;
}
}
return ret;
@@ -122,8 +121,6 @@ via_gem_state(struct drm_device *dev, void *data, struct
drm_file *file_priv)
args->domains = bo->mem.placement & TTM_PL_MASK_MEM;
args->offset = bo->offset;
args->size = bo->mem.size;
-
- obj->read_domains = obj->write_domain = args->domains;
}
}
mutex_lock(&dev->struct_mutex);
commit dac0d8095d9cdfd7396a01950a6d29ffdd451237
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Apr 3 20:13:22 2018 -0700
drm/openchrome: Add BO as parameter to the ttm_tt_create callback
Refer to commit dde5da2 and 81f5ec0.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_drv.h
b/drivers/gpu/drm/openchrome/via_drv.h
index c1beef590ece..535927afa908 100644
--- a/drivers/gpu/drm/openchrome/via_drv.h
+++ b/drivers/gpu/drm/openchrome/via_drv.h
@@ -43,6 +43,7 @@
#include "ttm/ttm_memory.h"
#include "ttm/ttm_module.h"
#include "ttm/ttm_page_alloc.h"
+#include "ttm/ttm_tt.h"
#include <drm/drmP.h>
#include <drm/drm_gem.h>
@@ -335,8 +336,8 @@ ttm_gem_create(struct drm_device *dev,
bool interruptible);
extern struct ttm_buffer_object *ttm_gem_mapping(struct drm_gem_object *obj);
-extern struct ttm_tt *
-via_sgdma_backend_init(struct ttm_bo_device *bdev, unsigned long size,
- uint32_t page_flags, struct page *dummy_read_page);
+extern struct ttm_tt* via_sgdma_backend_init(
+ struct ttm_buffer_object *bo,
+ uint32_t page_flags);
#endif
diff --git a/drivers/gpu/drm/openchrome/via_sgdma.c
b/drivers/gpu/drm/openchrome/via_sgdma.c
index 83ed1349db11..e6fcbf79836f 100644
--- a/drivers/gpu/drm/openchrome/via_sgdma.c
+++ b/drivers/gpu/drm/openchrome/via_sgdma.c
@@ -95,9 +95,8 @@ static struct ttm_backend_func ttm_sgdma_func = {
.destroy = via_sgdma_destroy,
};
-struct ttm_tt *
-via_sgdma_backend_init(struct ttm_bo_device *bdev, unsigned long size,
- uint32_t page_flags, struct page *dummy_read_page)
+struct ttm_tt* via_sgdma_backend_init(struct ttm_buffer_object *bo,
+ uint32_t page_flags)
{
struct sgdma_tt *dma_tt;
@@ -107,7 +106,7 @@ via_sgdma_backend_init(struct ttm_bo_device *bdev, unsigned
long size,
dma_tt->sgdma.ttm.func = &ttm_sgdma_func;
- if (ttm_dma_tt_init(&dma_tt->sgdma, bdev, size, page_flags,
dummy_read_page)) {
+ if (ttm_dma_tt_init(&dma_tt->sgdma, bo, page_flags)) {
kfree(dma_tt);
return NULL;
}
diff --git a/drivers/gpu/drm/openchrome/via_ttm.c
b/drivers/gpu/drm/openchrome/via_ttm.c
index 80b073ad6404..b9cc11014497 100644
--- a/drivers/gpu/drm/openchrome/via_ttm.c
+++ b/drivers/gpu/drm/openchrome/via_ttm.c
@@ -105,24 +105,21 @@ via_ttm_bo_destroy(struct ttm_buffer_object *bo)
heap = NULL;
}
-static struct ttm_tt *
-via_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size,
- uint32_t page_flags, struct page *dummy_read_page)
+struct ttm_tt* via_ttm_tt_create(struct ttm_buffer_object *bo,
+ uint32_t page_flags)
{
- struct via_device *dev_priv = container_of(bdev,
+ struct via_device *dev_priv = container_of(bo->bdev,
struct via_device, ttm.bdev);
#if IS_ENABLED(CONFIG_AGP)
if (pci_find_capability(dev_priv->dev->pdev, PCI_CAP_ID_AGP)) {
- return ttm_agp_tt_create(bdev,
- dev_priv->dev->agp->bridge,
- size, page_flags, dummy_read_page);
+ return ttm_agp_tt_create(bo,
+ dev_priv->dev->agp->bridge,
+ page_flags);
}
#endif
- return via_sgdma_backend_init(bdev, size, page_flags,
- dummy_read_page);
-
+ return via_sgdma_backend_init(bo, page_flags);
}
static int via_ttm_tt_populate(struct ttm_tt *ttm,
commit f57ad6b62ab83bd6ad11d34cb1219e43939a117d
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Tue Apr 3 19:09:06 2018 -0700
drm/openchrome: Drop persistent_swap_storage from ttm_bo_init
Due to commit 724daa4.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_ttm.c
b/drivers/gpu/drm/openchrome/via_ttm.c
index 19237170aa58..80b073ad6404 100644
--- a/drivers/gpu/drm/openchrome/via_ttm.c
+++ b/drivers/gpu/drm/openchrome/via_ttm.c
@@ -729,7 +729,7 @@ int via_bo_create(struct ttm_bo_device *bdev,
ret = ttm_bo_init(bdev, bo, size, type, &placement,
page_alignment >> PAGE_SHIFT,
- interruptible, NULL, acc_size,
+ interruptible, acc_size,
sg, NULL, via_ttm_bo_destroy);
if (unlikely(ret)) {
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
