Commit e2f572aa authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Gerd Hoffmann

drm/hisilicon: Convert hibmc-drm driver to |struct drm_gem_vram_object|

The data structure |struct drm_gem_vram_object| and its helpers replace
|struct hibmc_bo|. It's the same implementation; except for the type
names.

v4:
	* select config option DRM_VRAM_HELPER
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20190508082630.15116-20-tzimmermann@suse.deSigned-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 94065bf5
...@@ -3,6 +3,7 @@ config DRM_HISI_HIBMC ...@@ -3,6 +3,7 @@ config DRM_HISI_HIBMC
depends on DRM && PCI && MMU depends on DRM && PCI && MMU
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_TTM select DRM_TTM
select DRM_VRAM_HELPER
help help
Choose this option if you have a Hisilicon Hibmc soc chipset. Choose this option if you have a Hisilicon Hibmc soc chipset.
......
...@@ -96,27 +96,32 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane, ...@@ -96,27 +96,32 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane,
struct drm_plane_state *state = plane->state; struct drm_plane_state *state = plane->state;
u32 reg; u32 reg;
int ret; int ret;
u64 gpu_addr = 0; s64 gpu_addr = 0;
unsigned int line_l; unsigned int line_l;
struct hibmc_drm_private *priv = plane->dev->dev_private; struct hibmc_drm_private *priv = plane->dev->dev_private;
struct hibmc_framebuffer *hibmc_fb; struct hibmc_framebuffer *hibmc_fb;
struct hibmc_bo *bo; struct drm_gem_vram_object *gbo;
if (!state->fb) if (!state->fb)
return; return;
hibmc_fb = to_hibmc_framebuffer(state->fb); hibmc_fb = to_hibmc_framebuffer(state->fb);
bo = gem_to_hibmc_bo(hibmc_fb->obj); gbo = drm_gem_vram_of_gem(hibmc_fb->obj);
ret = ttm_bo_reserve(&bo->bo, true, false, NULL); ret = drm_gem_vram_reserve(gbo, false);
if (ret) { if (ret) {
DRM_ERROR("failed to reserve ttm_bo: %d", ret); DRM_ERROR("failed to reserve BO: %d", ret);
return; return;
} }
ret = hibmc_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr); ret = drm_gem_vram_pin(gbo, DRM_GEM_VRAM_PL_FLAG_VRAM);
ttm_bo_unreserve(&bo->bo); drm_gem_vram_unreserve(gbo);
if (ret) { if (ret) {
DRM_ERROR("failed to pin hibmc_bo: %d", ret); DRM_ERROR("failed to pin bo: %d", ret);
return;
}
gpu_addr = drm_gem_vram_offset(gbo);
if (gpu_addr < 0) {
drm_gem_vram_unpin(gbo);
return; return;
} }
......
...@@ -63,9 +63,10 @@ static struct drm_driver hibmc_driver = { ...@@ -63,9 +63,10 @@ static struct drm_driver hibmc_driver = {
.desc = "hibmc drm driver", .desc = "hibmc drm driver",
.major = 1, .major = 1,
.minor = 0, .minor = 0,
.gem_free_object_unlocked = hibmc_gem_free_object, .gem_free_object_unlocked =
drm_gem_vram_driver_gem_free_object_unlocked,
.dumb_create = hibmc_dumb_create, .dumb_create = hibmc_dumb_create,
.dumb_map_offset = hibmc_dumb_mmap_offset, .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset,
.irq_handler = hibmc_drm_interrupt, .irq_handler = hibmc_drm_interrupt,
}; };
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
#include <drm/drm_fb_helper.h> #include <drm/drm_fb_helper.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_gem_vram_helper.h>
#include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_bo_driver.h>
struct hibmc_framebuffer { struct hibmc_framebuffer {
...@@ -59,25 +60,6 @@ struct hibmc_drm_private { ...@@ -59,25 +60,6 @@ struct hibmc_drm_private {
#define to_hibmc_framebuffer(x) container_of(x, struct hibmc_framebuffer, fb) #define to_hibmc_framebuffer(x) container_of(x, struct hibmc_framebuffer, fb)
struct hibmc_bo {
struct ttm_buffer_object bo;
struct ttm_placement placement;
struct ttm_bo_kmap_obj kmap;
struct drm_gem_object gem;
struct ttm_place placements[3];
int pin_count;
};
static inline struct hibmc_bo *hibmc_bo(struct ttm_buffer_object *bo)
{
return container_of(bo, struct hibmc_bo, bo);
}
static inline struct hibmc_bo *gem_to_hibmc_bo(struct drm_gem_object *gem)
{
return container_of(gem, struct hibmc_bo, gem);
}
void hibmc_set_power_mode(struct hibmc_drm_private *priv, void hibmc_set_power_mode(struct hibmc_drm_private *priv,
unsigned int power_mode); unsigned int power_mode);
void hibmc_set_current_gate(struct hibmc_drm_private *priv, void hibmc_set_current_gate(struct hibmc_drm_private *priv,
...@@ -97,13 +79,8 @@ hibmc_framebuffer_init(struct drm_device *dev, ...@@ -97,13 +79,8 @@ hibmc_framebuffer_init(struct drm_device *dev,
int hibmc_mm_init(struct hibmc_drm_private *hibmc); int hibmc_mm_init(struct hibmc_drm_private *hibmc);
void hibmc_mm_fini(struct hibmc_drm_private *hibmc); void hibmc_mm_fini(struct hibmc_drm_private *hibmc);
int hibmc_bo_pin(struct hibmc_bo *bo, u32 pl_flag, u64 *gpu_addr);
int hibmc_bo_unpin(struct hibmc_bo *bo);
void hibmc_gem_free_object(struct drm_gem_object *obj);
int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
struct drm_mode_create_dumb *args); struct drm_mode_create_dumb *args);
int hibmc_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,
u32 handle, u64 *offset);
int hibmc_mmap(struct file *filp, struct vm_area_struct *vma); int hibmc_mmap(struct file *filp, struct vm_area_struct *vma);
extern const struct drm_mode_config_funcs hibmc_mode_funcs; extern const struct drm_mode_config_funcs hibmc_mode_funcs;
......
...@@ -66,7 +66,8 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, ...@@ -66,7 +66,8 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,
int ret1; int ret1;
size_t size; size_t size;
unsigned int bytes_per_pixel; unsigned int bytes_per_pixel;
struct hibmc_bo *bo = NULL; struct drm_gem_vram_object *gbo = NULL;
void *base;
DRM_DEBUG_DRIVER("surface width(%d), height(%d) and bpp(%d)\n", DRM_DEBUG_DRIVER("surface width(%d), height(%d) and bpp(%d)\n",
sizes->surface_width, sizes->surface_height, sizes->surface_width, sizes->surface_height,
...@@ -88,26 +89,27 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, ...@@ -88,26 +89,27 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,
return -ENOMEM; return -ENOMEM;
} }
bo = gem_to_hibmc_bo(gobj); gbo = drm_gem_vram_of_gem(gobj);
ret = ttm_bo_reserve(&bo->bo, true, false, NULL); ret = drm_gem_vram_reserve(gbo, false);
if (ret) { if (ret) {
DRM_ERROR("failed to reserve ttm_bo: %d\n", ret); DRM_ERROR("failed to reserve bo: %d\n", ret);
goto out_unref_gem; goto out_unref_gem;
} }
ret = hibmc_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL); ret = drm_gem_vram_pin(gbo, DRM_GEM_VRAM_PL_FLAG_VRAM);
if (ret) { if (ret) {
DRM_ERROR("failed to pin fbcon: %d\n", ret); DRM_ERROR("failed to pin fbcon: %d\n", ret);
goto out_unreserve_ttm_bo; goto out_unreserve_ttm_bo;
} }
ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap); base = drm_gem_vram_kmap(gbo, true, NULL);
if (ret) { if (IS_ERR(base)) {
ret = PTR_ERR(base);
DRM_ERROR("failed to kmap fbcon: %d\n", ret); DRM_ERROR("failed to kmap fbcon: %d\n", ret);
goto out_unpin_bo; goto out_unpin_bo;
} }
ttm_bo_unreserve(&bo->bo); drm_gem_vram_unreserve(gbo);
info = drm_fb_helper_alloc_fbi(helper); info = drm_fb_helper_alloc_fbi(helper);
if (IS_ERR(info)) { if (IS_ERR(info)) {
...@@ -131,24 +133,24 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, ...@@ -131,24 +133,24 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,
drm_fb_helper_fill_info(info, &priv->fbdev->helper, sizes); drm_fb_helper_fill_info(info, &priv->fbdev->helper, sizes);
info->screen_base = bo->kmap.virtual; info->screen_base = base;
info->screen_size = size; info->screen_size = size;
info->fix.smem_start = bo->bo.mem.bus.offset + bo->bo.mem.bus.base; info->fix.smem_start = gbo->bo.mem.bus.offset + gbo->bo.mem.bus.base;
info->fix.smem_len = size; info->fix.smem_len = size;
return 0; return 0;
out_release_fbi: out_release_fbi:
ret1 = ttm_bo_reserve(&bo->bo, true, false, NULL); ret1 = drm_gem_vram_reserve(gbo, false);
if (ret1) { if (ret1) {
DRM_ERROR("failed to rsv ttm_bo when release fbi: %d\n", ret1); DRM_ERROR("failed to rsv ttm_bo when release fbi: %d\n", ret1);
goto out_unref_gem; goto out_unref_gem;
} }
ttm_bo_kunmap(&bo->kmap); drm_gem_vram_kunmap(gbo);
out_unpin_bo: out_unpin_bo:
hibmc_bo_unpin(bo); drm_gem_vram_unpin(gbo);
out_unreserve_ttm_bo: out_unreserve_ttm_bo:
ttm_bo_unreserve(&bo->bo); drm_gem_vram_unreserve(gbo);
out_unref_gem: out_unref_gem:
drm_gem_object_put_unlocked(gobj); drm_gem_object_put_unlocked(gobj);
......
...@@ -27,19 +27,6 @@ hibmc_bdev(struct ttm_bo_device *bd) ...@@ -27,19 +27,6 @@ hibmc_bdev(struct ttm_bo_device *bd)
return container_of(bd, struct hibmc_drm_private, bdev); return container_of(bd, struct hibmc_drm_private, bdev);
} }
static void hibmc_bo_ttm_destroy(struct ttm_buffer_object *tbo)
{
struct hibmc_bo *bo = container_of(tbo, struct hibmc_bo, bo);
drm_gem_object_release(&bo->gem);
kfree(bo);
}
static bool hibmc_ttm_bo_is_hibmc_bo(struct ttm_buffer_object *bo)
{
return bo->destroy == &hibmc_bo_ttm_destroy;
}
static int static int
hibmc_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type, hibmc_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type,
struct ttm_mem_type_manager *man) struct ttm_mem_type_manager *man)
...@@ -65,52 +52,6 @@ hibmc_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type, ...@@ -65,52 +52,6 @@ hibmc_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type,
return 0; return 0;
} }
void hibmc_ttm_placement(struct hibmc_bo *bo, int domain)
{
u32 count = 0;
u32 i;
bo->placement.placement = bo->placements;
bo->placement.busy_placement = bo->placements;
if (domain & TTM_PL_FLAG_VRAM)
bo->placements[count++].flags = TTM_PL_FLAG_WC |
TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
if (domain & TTM_PL_FLAG_SYSTEM)
bo->placements[count++].flags = TTM_PL_MASK_CACHING |
TTM_PL_FLAG_SYSTEM;
if (!count)
bo->placements[count++].flags = TTM_PL_MASK_CACHING |
TTM_PL_FLAG_SYSTEM;
bo->placement.num_placement = count;
bo->placement.num_busy_placement = count;
for (i = 0; i < count; i++) {
bo->placements[i].fpfn = 0;
bo->placements[i].lpfn = 0;
}
}
static void
hibmc_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
{
struct hibmc_bo *hibmcbo = hibmc_bo(bo);
if (!hibmc_ttm_bo_is_hibmc_bo(bo))
return;
hibmc_ttm_placement(hibmcbo, TTM_PL_FLAG_SYSTEM);
*pl = hibmcbo->placement;
}
static int hibmc_bo_verify_access(struct ttm_buffer_object *bo,
struct file *filp)
{
struct hibmc_bo *hibmcbo = hibmc_bo(bo);
return drm_vma_node_verify_access(&hibmcbo->gem.vma_node,
filp->private_data);
}
static int hibmc_ttm_io_mem_reserve(struct ttm_bo_device *bdev, static int hibmc_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
struct ttm_mem_reg *mem) struct ttm_mem_reg *mem)
{ {
...@@ -173,9 +114,9 @@ static struct ttm_tt *hibmc_ttm_tt_create(struct ttm_buffer_object *bo, ...@@ -173,9 +114,9 @@ static struct ttm_tt *hibmc_ttm_tt_create(struct ttm_buffer_object *bo,
struct ttm_bo_driver hibmc_bo_driver = { struct ttm_bo_driver hibmc_bo_driver = {
.ttm_tt_create = hibmc_ttm_tt_create, .ttm_tt_create = hibmc_ttm_tt_create,
.init_mem_type = hibmc_bo_init_mem_type, .init_mem_type = hibmc_bo_init_mem_type,
.evict_flags = hibmc_bo_evict_flags, .evict_flags = drm_gem_vram_bo_driver_evict_flags,
.move = NULL, .move = NULL,
.verify_access = hibmc_bo_verify_access, .verify_access = drm_gem_vram_bo_driver_verify_access,
.io_mem_reserve = &hibmc_ttm_io_mem_reserve, .io_mem_reserve = &hibmc_ttm_io_mem_reserve,
.io_mem_free = NULL, .io_mem_free = NULL,
}; };
...@@ -215,108 +156,6 @@ void hibmc_mm_fini(struct hibmc_drm_private *hibmc) ...@@ -215,108 +156,6 @@ void hibmc_mm_fini(struct hibmc_drm_private *hibmc)
hibmc->mm_inited = false; hibmc->mm_inited = false;
} }
static void hibmc_bo_unref(struct hibmc_bo **bo)
{
struct ttm_buffer_object *tbo;
if ((*bo) == NULL)
return;
tbo = &((*bo)->bo);
ttm_bo_put(tbo);
*bo = NULL;
}
int hibmc_bo_create(struct drm_device *dev, int size, int align,
u32 flags, struct hibmc_bo **phibmcbo)
{
struct hibmc_drm_private *hibmc = dev->dev_private;
struct hibmc_bo *hibmcbo;
size_t acc_size;
int ret;
hibmcbo = kzalloc(sizeof(*hibmcbo), GFP_KERNEL);
if (!hibmcbo) {
DRM_ERROR("failed to allocate hibmcbo\n");
return -ENOMEM;
}
ret = drm_gem_object_init(dev, &hibmcbo->gem, size);
if (ret) {
DRM_ERROR("failed to initialize drm gem object: %d\n", ret);
kfree(hibmcbo);
return ret;
}
hibmcbo->bo.bdev = &hibmc->bdev;
hibmc_ttm_placement(hibmcbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);
acc_size = ttm_bo_dma_acc_size(&hibmc->bdev, size,
sizeof(struct hibmc_bo));
ret = ttm_bo_init(&hibmc->bdev, &hibmcbo->bo, size,
ttm_bo_type_device, &hibmcbo->placement,
align >> PAGE_SHIFT, false, acc_size,
NULL, NULL, hibmc_bo_ttm_destroy);
if (ret) {
hibmc_bo_unref(&hibmcbo);
DRM_ERROR("failed to initialize ttm_bo: %d\n", ret);
return ret;
}
*phibmcbo = hibmcbo;
return 0;
}
int hibmc_bo_pin(struct hibmc_bo *bo, u32 pl_flag, u64 *gpu_addr)
{
struct ttm_operation_ctx ctx = { false, false };
int i, ret;
if (bo->pin_count) {
bo->pin_count++;
if (gpu_addr)
*gpu_addr = bo->bo.offset;
return 0;
}
hibmc_ttm_placement(bo, pl_flag);
for (i = 0; i < bo->placement.num_placement; i++)
bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
if (ret)
return ret;
bo->pin_count = 1;
if (gpu_addr)
*gpu_addr = bo->bo.offset;
return 0;
}
int hibmc_bo_unpin(struct hibmc_bo *bo)
{
struct ttm_operation_ctx ctx = { false, false };
int i, ret;
if (!bo->pin_count) {
DRM_ERROR("unpin bad %p\n", bo);
return 0;
}
bo->pin_count--;
if (bo->pin_count)
return 0;
for (i = 0; i < bo->placement.num_placement ; i++)
bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;
ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
if (ret) {
DRM_ERROR("validate failed for unpin: %d\n", ret);
return ret;
}
return 0;
}
int hibmc_mmap(struct file *filp, struct vm_area_struct *vma) int hibmc_mmap(struct file *filp, struct vm_area_struct *vma)
{ {
struct drm_file *file_priv = filp->private_data; struct drm_file *file_priv = filp->private_data;
...@@ -328,24 +167,24 @@ int hibmc_mmap(struct file *filp, struct vm_area_struct *vma) ...@@ -328,24 +167,24 @@ int hibmc_mmap(struct file *filp, struct vm_area_struct *vma)
int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel, int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
struct drm_gem_object **obj) struct drm_gem_object **obj)
{ {
struct hibmc_bo *hibmcbo; struct hibmc_drm_private *hibmc = dev->dev_private;
struct drm_gem_vram_object *gbo;
int ret; int ret;
*obj = NULL; *obj = NULL;
size = PAGE_ALIGN(size); size = roundup(size, PAGE_SIZE);
if (size == 0) { if (size == 0)
DRM_ERROR("error: zero size\n");
return -EINVAL; return -EINVAL;
}
ret = hibmc_bo_create(dev, size, 0, 0, &hibmcbo); gbo = drm_gem_vram_create(dev, &hibmc->bdev, size, 0, false);
if (ret) { if (IS_ERR(gbo)) {
ret = PTR_ERR(gbo);
if (ret != -ERESTARTSYS) if (ret != -ERESTARTSYS)
DRM_ERROR("failed to allocate GEM object: %d\n", ret); DRM_ERROR("failed to allocate GEM object: %d\n", ret);
return ret; return ret;
} }
*obj = &hibmcbo->gem; *obj = &gbo->gem;
return 0; return 0;
} }
...@@ -377,35 +216,6 @@ int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, ...@@ -377,35 +216,6 @@ int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
return 0; return 0;
} }
void hibmc_gem_free_object(struct drm_gem_object *obj)
{
struct hibmc_bo *hibmcbo = gem_to_hibmc_bo(obj);
hibmc_bo_unref(&hibmcbo);
}
static u64 hibmc_bo_mmap_offset(struct hibmc_bo *bo)
{
return drm_vma_node_offset_addr(&bo->bo.vma_node);
}
int hibmc_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,
u32 handle, u64 *offset)
{
struct drm_gem_object *obj;
struct hibmc_bo *bo;
obj = drm_gem_object_lookup(file, handle);
if (!obj)
return -ENOENT;
bo = gem_to_hibmc_bo(obj);
*offset = hibmc_bo_mmap_offset(bo);
drm_gem_object_put_unlocked(obj);
return 0;
}
static void hibmc_user_framebuffer_destroy(struct drm_framebuffer *fb) static void hibmc_user_framebuffer_destroy(struct drm_framebuffer *fb)
{ {
struct hibmc_framebuffer *hibmc_fb = to_hibmc_framebuffer(fb); struct hibmc_framebuffer *hibmc_fb = to_hibmc_framebuffer(fb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment