[Openchrome-devel] drm-openchrome: Branch 'drm-next-3.19' - 3 commits - drivers/gpu/drm
Kevin Brace
kevinbrace at kemper.freedesktop.org
Sun Aug 27 04:52:47 UTC 2017
drivers/gpu/drm/openchrome/ttm_gem.c | 8 ++++----
drivers/gpu/drm/openchrome/via_display.c | 2 +-
drivers/gpu/drm/openchrome/via_display.h | 2 +-
drivers/gpu/drm/openchrome/via_drv.h | 11 +++--------
drivers/gpu/drm/openchrome/via_fb.c | 2 +-
drivers/gpu/drm/openchrome/via_ttm.c | 10 +++++-----
6 files changed, 15 insertions(+), 20 deletions(-)
New commits:
commit bc6da9c6cff1bda5e4c9fd970537aba464e4f977
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Aug 26 21:51:50 2017 -0700
Rename ttm_heap struct’s pbo to bo
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/ttm_gem.c b/drivers/gpu/drm/openchrome/ttm_gem.c
index a5eb74e656e2..b6a995b7af2e 100644
--- a/drivers/gpu/drm/openchrome/ttm_gem.c
+++ b/drivers/gpu/drm/openchrome/ttm_gem.c
@@ -37,10 +37,10 @@ int ttm_gem_open_object(struct drm_gem_object *obj, struct drm_file *file_priv)
void ttm_gem_free_object(struct drm_gem_object *obj)
{
struct ttm_gem_object *gem = container_of(obj, struct ttm_gem_object, gem);
+ struct ttm_buffer_object *bo;
if (gem->heap != NULL) {
- struct ttm_buffer_object *bo = &gem->heap->pbo;
-
+ bo = &gem->heap->bo;
ttm_bo_unref(&bo);
gem->heap = NULL;
}
@@ -56,7 +56,7 @@ ttm_gem_mapping(struct drm_gem_object *obj)
gem = container_of(obj, struct ttm_gem_object, gem);
if (gem->heap == NULL)
return NULL;
- return &gem->heap->pbo;
+ return &gem->heap->bo;
}
/*
@@ -109,7 +109,7 @@ ttm_gem_create(struct drm_device *dev, struct ttm_bo_device *bdev,
return ERR_PTR(ret);
}
- obj->heap = container_of(bo, struct ttm_heap, pbo);
+ obj->heap = container_of(bo, struct ttm_heap, bo);
bo->persistent_swap_storage = obj->gem.filp;
return &obj->gem;
}
diff --git a/drivers/gpu/drm/openchrome/via_drv.h b/drivers/gpu/drm/openchrome/via_drv.h
index e5ff67b88eb9..e9473e667a26 100644
--- a/drivers/gpu/drm/openchrome/via_drv.h
+++ b/drivers/gpu/drm/openchrome/via_drv.h
@@ -106,9 +106,9 @@ struct via_state {
};
struct ttm_heap {
- struct ttm_place busy_placements[TTM_NUM_MEM_TYPES];
- struct ttm_place placements[TTM_NUM_MEM_TYPES];
- struct ttm_buffer_object pbo;
+ struct ttm_buffer_object bo;
+ struct ttm_place busy_placements[TTM_NUM_MEM_TYPES];
+ struct ttm_place placements[TTM_NUM_MEM_TYPES];
};
struct ttm_gem_object {
diff --git a/drivers/gpu/drm/openchrome/via_ttm.c b/drivers/gpu/drm/openchrome/via_ttm.c
index d65ec04a7490..259c3eba8428 100644
--- a/drivers/gpu/drm/openchrome/via_ttm.c
+++ b/drivers/gpu/drm/openchrome/via_ttm.c
@@ -99,7 +99,7 @@ via_ttm_global_release(struct drm_global_reference *global_ref,
static void
via_ttm_bo_destroy(struct ttm_buffer_object *bo)
{
- struct ttm_heap *heap = container_of(bo, struct ttm_heap, pbo);
+ struct ttm_heap *heap = container_of(bo, struct ttm_heap, bo);
kfree(heap);
heap = NULL;
@@ -666,7 +666,7 @@ void
ttm_placement_from_domain(struct ttm_buffer_object *bo, struct ttm_placement *placement, u32 domains,
struct ttm_bo_device *bdev)
{
- struct ttm_heap *heap = container_of(bo, struct ttm_heap, pbo);
+ struct ttm_heap *heap = container_of(bo, struct ttm_heap, bo);
int cnt = 0, i = 0;
if (!(domains & TTM_PL_MASK_MEM))
@@ -718,7 +718,7 @@ via_bo_create(struct ttm_bo_device *bdev,
goto exit;
}
- bo = &heap->pbo;
+ bo = &heap->bo;
ttm_placement_from_domain(bo, &placement, domains, bdev);
@@ -747,7 +747,7 @@ exit:
int
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_heap *heap = container_of(bo, struct ttm_heap, bo);
struct ttm_placement placement;
int ret;
@@ -768,7 +768,7 @@ via_bo_pin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap)
int
via_bo_unpin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap)
{
- struct ttm_heap *heap = container_of(bo, struct ttm_heap, pbo);
+ struct ttm_heap *heap = container_of(bo, struct ttm_heap, bo);
struct ttm_placement placement;
int ret;
commit b87f7ed4735ae3f62a62ac31c8c521c026a1c820
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Aug 26 21:36:41 2017 -0700
Rename via_framebuffer_fini to via_fbdev_fini
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_display.c b/drivers/gpu/drm/openchrome/via_display.c
index e6f87131cda6..37ac7a78b615 100644
--- a/drivers/gpu/drm/openchrome/via_display.c
+++ b/drivers/gpu/drm/openchrome/via_display.c
@@ -554,7 +554,7 @@ void via_modeset_fini(struct drm_device *dev)
struct drm_encoder *encoder, *enct;
drm_kms_helper_poll_fini(dev);
- via_framebuffer_fini(dev);
+ via_fbdev_fini(dev);
/* drm_mode_config_init has not been called yet */
if (!dev->mode_config.dpms_property)
diff --git a/drivers/gpu/drm/openchrome/via_display.h b/drivers/gpu/drm/openchrome/via_display.h
index 4e8ab52f1d43..f67beb15ec0c 100644
--- a/drivers/gpu/drm/openchrome/via_display.h
+++ b/drivers/gpu/drm/openchrome/via_display.h
@@ -144,7 +144,7 @@ extern void via_set_vclock(struct drm_crtc *crtc, u32 clk);
/* framebuffers */
extern int via_fbdev_init(struct drm_device *dev);
-extern void via_framebuffer_fini(struct drm_device *dev);
+extern void via_fbdev_fini(struct drm_device *dev);
/* crtc */
extern void via_load_crtc_pixel_timing(struct drm_crtc *crtc,
diff --git a/drivers/gpu/drm/openchrome/via_fb.c b/drivers/gpu/drm/openchrome/via_fb.c
index feab2833d25f..75b44e603af7 100644
--- a/drivers/gpu/drm/openchrome/via_fb.c
+++ b/drivers/gpu/drm/openchrome/via_fb.c
@@ -1240,7 +1240,7 @@ exit:
return ret;
}
-void via_framebuffer_fini(struct drm_device *dev)
+void via_fbdev_fini(struct drm_device *dev)
{
struct via_device *dev_priv = dev->dev_private;
struct drm_fb_helper *fb_helper = &dev_priv->via_fbdev->helper;
commit 26364f6410f1c1afa2a12e852fc6b43180135ccc
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Aug 26 21:27:24 2017 -0700
Remove ttm_fb_helper struct
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/via_drv.h b/drivers/gpu/drm/openchrome/via_drv.h
index 5bf9e2bffb16..e5ff67b88eb9 100644
--- a/drivers/gpu/drm/openchrome/via_drv.h
+++ b/drivers/gpu/drm/openchrome/via_drv.h
@@ -116,11 +116,6 @@ struct ttm_gem_object {
struct ttm_heap *heap;
};
-struct ttm_fb_helper {
- struct drm_fb_helper base;
- struct ttm_bo_kmap_obj kmap;
-};
-
struct via_framebuffer {
struct drm_framebuffer fb;
struct drm_gem_object *gem_obj;
More information about the Openchrome-devel
mailing list