[Openchrome-devel] drm-openchrome: 2 commits - drivers/gpu/drm
Kevin Brace
kevinbrace at kemper.freedesktop.org
Mon Jan 16 19:59:38 UTC 2017
drivers/gpu/drm/via/init_ttm.c | 8 ++++----
drivers/gpu/drm/via/ttm_gem.c | 2 +-
drivers/gpu/drm/via/via_crtc.c | 4 ++--
drivers/gpu/drm/via/via_drv.c | 4 ++--
drivers/gpu/drm/via/via_fb.c | 2 +-
drivers/gpu/drm/via/via_h1_cmdbuf.c | 4 ++--
drivers/gpu/drm/via/via_mem.h | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ea14f4681f95537433dc221c566c36e818664ee3
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Jan 16 13:58:00 2017 -0600
Changed ttm_bo_allocate to via_bo_allocate
It is very confusing to name local TTM related functions like ttm_*,
so this one will now be renamed as via_*.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/init_ttm.c b/drivers/gpu/drm/via/init_ttm.c
index df451ea..0b712b6 100644
--- a/drivers/gpu/drm/via/init_ttm.c
+++ b/drivers/gpu/drm/via/init_ttm.c
@@ -141,7 +141,7 @@ ttm_placement_from_domain(struct ttm_buffer_object *bo, struct ttm_placement *pl
}
int
-ttm_bo_allocate(struct ttm_bo_device *bdev,
+via_bo_allocate(struct ttm_bo_device *bdev,
unsigned long size,
enum ttm_bo_type origin,
uint32_t domains,
@@ -229,7 +229,7 @@ ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
uint32_t alignment, uint32_t domain,
struct ttm_bo_kmap_obj *kmap)
{
- int ret = ttm_bo_allocate(bdev, size, ttm_bo_type_kernel, domain,
+ int ret = via_bo_allocate(bdev, size, ttm_bo_type_kernel, domain,
alignment, PAGE_SIZE, false, NULL,
NULL, &kmap->bo);
if (likely(!ret)) {
diff --git a/drivers/gpu/drm/via/ttm_gem.c b/drivers/gpu/drm/via/ttm_gem.c
index e630747..aa46773 100644
--- a/drivers/gpu/drm/via/ttm_gem.c
+++ b/drivers/gpu/drm/via/ttm_gem.c
@@ -95,7 +95,7 @@ ttm_gem_create(struct drm_device *dev, struct ttm_bo_device *bdev,
size = round_up(size, byte_align);
size = ALIGN(size, page_align);
- ret = ttm_bo_allocate(bdev, size, origin, types, byte_align,
+ ret = via_bo_allocate(bdev, size, origin, types, byte_align,
page_align, interruptible, NULL, NULL, &bo);
if (ret) {
DRM_ERROR("Failed to create buffer object\n");
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 7ccd0c0..f7ab710 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -151,7 +151,7 @@ via_mmio_setup(struct drm_device *dev)
if (ret)
return ret;
- ret = ttm_bo_allocate(&dev_priv->bdev, VIA_MMIO_REGSIZE, ttm_bo_type_kernel,
+ ret = via_bo_allocate(&dev_priv->bdev, VIA_MMIO_REGSIZE, ttm_bo_type_kernel,
TTM_PL_FLAG_PRIV0, 1, PAGE_SIZE, false, NULL, NULL, &bo);
if (ret)
goto err;
diff --git a/drivers/gpu/drm/via/via_h1_cmdbuf.c b/drivers/gpu/drm/via/via_h1_cmdbuf.c
index d4d66c4..92bf0a3 100644
--- a/drivers/gpu/drm/via/via_h1_cmdbuf.c
+++ b/drivers/gpu/drm/via/via_h1_cmdbuf.c
@@ -159,7 +159,7 @@ static int via_initialize(struct drm_device *dev,
return ret;
}
- ret = ttm_bo_allocate(&dev_priv->bdev, init->size, ttm_bo_type_kernel,
+ ret = via_bo_allocate(&dev_priv->bdev, init->size, ttm_bo_type_kernel,
TTM_PL_FLAG_TT, VIA_MM_ALIGN_SIZE, PAGE_SIZE,
false, NULL, NULL, &bo);
if (!ret) {
diff --git a/drivers/gpu/drm/via/via_mem.h b/drivers/gpu/drm/via/via_mem.h
index fde67ec..4641dc2 100644
--- a/drivers/gpu/drm/via/via_mem.h
+++ b/drivers/gpu/drm/via/via_mem.h
@@ -50,7 +50,7 @@ extern void ttm_global_fini(struct drm_global_reference *global_ref,
struct ttm_bo_global_ref *global_bo,
struct ttm_bo_device *bdev);
-extern int ttm_bo_allocate(struct ttm_bo_device *bdev, unsigned long size,
+extern int via_bo_allocate(struct ttm_bo_device *bdev, unsigned long size,
enum ttm_bo_type origin, uint32_t domains,
uint32_t byte_align, uint32_t page_align,
bool interruptible, struct sg_table *sg,
commit aa0d12a3e88dc4a4be304d12c228e7c34dc69e8d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Jan 16 13:56:30 2017 -0600
Changed ttm_bo_pin to via_bo_pin
ttm_bo_pin function in the current OpenChrome DRM is called
radeon_bo_pin by AMD Radeon DRM. It is very confusing to name local
TTM related functions like ttm_*, so this one will now be renamed
as via_*.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/init_ttm.c b/drivers/gpu/drm/via/init_ttm.c
index cf89662..df451ea 100644
--- a/drivers/gpu/drm/via/init_ttm.c
+++ b/drivers/gpu/drm/via/init_ttm.c
@@ -182,7 +182,7 @@ ttm_bo_allocate(struct ttm_bo_device *bdev,
}
int
-ttm_bo_pin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap)
+via_bo_pin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap)
{
struct ttm_heap *heap = container_of(bo, struct ttm_heap, pbo);
struct ttm_placement placement;
@@ -233,7 +233,7 @@ ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
alignment, PAGE_SIZE, false, NULL,
NULL, &kmap->bo);
if (likely(!ret)) {
- ret = ttm_bo_pin(kmap->bo, kmap);
+ ret = via_bo_pin(kmap->bo, kmap);
if (unlikely(ret)) {
DRM_ERROR("failed to mmap the buffer\n");
ttm_bo_unref(&kmap->bo);
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 344f30a..39ab915 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -1251,7 +1251,7 @@ via_iga1_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
obj = new_fb->helper_private;
bo = ttm_gem_mapping(obj);
- ret = ttm_bo_pin(bo, NULL);
+ ret = via_bo_pin(bo, NULL);
if (unlikely(ret)) {
DRM_DEBUG("failed to pin FB\n");
return ret;
@@ -1564,7 +1564,7 @@ via_iga2_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
obj = new_fb->helper_private;
bo = ttm_gem_mapping(obj);
- ret = ttm_bo_pin(bo, NULL);
+ ret = via_bo_pin(bo, NULL);
if (unlikely(ret)) {
DRM_DEBUG("failed to pin FB\n");
return ret;
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index e176465..7ccd0c0 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -156,7 +156,7 @@ via_mmio_setup(struct drm_device *dev)
if (ret)
goto err;
- ret = ttm_bo_pin(bo, &dev_priv->mmio);
+ ret = via_bo_pin(bo, &dev_priv->mmio);
err:
if (!ret)
DRM_INFO("Detected MMIO at physical address 0x%08llx.\n",
diff --git a/drivers/gpu/drm/via/via_fb.c b/drivers/gpu/drm/via/via_fb.c
index a105fb4..e819450 100644
--- a/drivers/gpu/drm/via/via_fb.c
+++ b/drivers/gpu/drm/via/via_fb.c
@@ -1031,7 +1031,7 @@ via_fb_probe(struct drm_fb_helper *helper,
if (kmap->bo == NULL)
goto out_err;
- ret = ttm_bo_pin(kmap->bo, kmap);
+ ret = via_bo_pin(kmap->bo, kmap);
if (unlikely(ret))
goto out_err;
diff --git a/drivers/gpu/drm/via/via_h1_cmdbuf.c b/drivers/gpu/drm/via/via_h1_cmdbuf.c
index c934990..d4d66c4 100644
--- a/drivers/gpu/drm/via/via_h1_cmdbuf.c
+++ b/drivers/gpu/drm/via/via_h1_cmdbuf.c
@@ -163,7 +163,7 @@ static int via_initialize(struct drm_device *dev,
TTM_PL_FLAG_TT, VIA_MM_ALIGN_SIZE, PAGE_SIZE,
false, NULL, NULL, &bo);
if (!ret) {
- ret = ttm_bo_pin(bo, &dev_priv->dmabuf);
+ ret = via_bo_pin(bo, &dev_priv->dmabuf);
if (ret)
goto out_err;
}
diff --git a/drivers/gpu/drm/via/via_mem.h b/drivers/gpu/drm/via/via_mem.h
index 5e1a437..fde67ec 100644
--- a/drivers/gpu/drm/via/via_mem.h
+++ b/drivers/gpu/drm/via/via_mem.h
@@ -60,7 +60,7 @@ extern void ttm_placement_from_domain(struct ttm_buffer_object *bo,
struct ttm_placement *placement,
u32 domains, struct ttm_bo_device *bdev);
extern int ttm_bo_unpin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
-extern int ttm_bo_pin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
+extern int via_bo_pin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
extern int ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
uint32_t alignment, uint32_t domain,
struct ttm_bo_kmap_obj *kmap);
More information about the Openchrome-devel
mailing list