korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-20 02:34:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/tegra: gem: Miscellaneous cleanups

Browse Source 
Rename the host1x_to_drm_bo() macro to host1x_to_tegra_bo() for
consistency and fixup various stylistic issues.

Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding 2013-09-24 16:34:05 +02:00
parent a137ce3438
commit 3be8274341
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gpu/host1x/drm/gem.c
View File

@ -20,14 +20,14 @@
#include "gem.h" #include "gem.h"
static inline struct tegra_bo *host1x_to_drm_bo(struct host1x_bo *bo) static inline struct tegra_bo *host1x_to_tegra_bo(struct host1x_bo *bo)
{ {
return container_of(bo, struct tegra_bo, base); return container_of(bo, struct tegra_bo, base);
} }
static void tegra_bo_put(struct host1x_bo *bo) static void tegra_bo_put(struct host1x_bo *bo)
{ {
struct tegra_bo *obj = host1x_to_drm_bo(bo); struct tegra_bo *obj = host1x_to_tegra_bo(bo);
struct drm_device *drm = obj->gem.dev; struct drm_device *drm = obj->gem.dev;
mutex_lock(&drm->struct_mutex); mutex_lock(&drm->struct_mutex);
@ -37,7 +37,7 @@ static void tegra_bo_put(struct host1x_bo *bo)
static dma_addr_t tegra_bo_pin(struct host1x_bo *bo, struct sg_table **sgt) static dma_addr_t tegra_bo_pin(struct host1x_bo *bo, struct sg_table **sgt)
{ {
struct tegra_bo *obj = host1x_to_drm_bo(bo); struct tegra_bo *obj = host1x_to_tegra_bo(bo);
return obj->paddr; return obj->paddr;
} }
@ -48,7 +48,7 @@ static void tegra_bo_unpin(struct host1x_bo *bo, struct sg_table *sgt)
static void *tegra_bo_mmap(struct host1x_bo *bo) static void *tegra_bo_mmap(struct host1x_bo *bo)
{ {
struct tegra_bo *obj = host1x_to_drm_bo(bo); struct tegra_bo *obj = host1x_to_tegra_bo(bo);
return obj->vaddr; return obj->vaddr;
} }
@ -59,7 +59,7 @@ static void tegra_bo_munmap(struct host1x_bo *bo, void *addr)
static void *tegra_bo_kmap(struct host1x_bo *bo, unsigned int page) static void *tegra_bo_kmap(struct host1x_bo *bo, unsigned int page)
{ {
struct tegra_bo *obj = host1x_to_drm_bo(bo); struct tegra_bo *obj = host1x_to_tegra_bo(bo);
return obj->vaddr + page * PAGE_SIZE; return obj->vaddr + page * PAGE_SIZE;
} }
@ -71,7 +71,7 @@ static void tegra_bo_kunmap(struct host1x_bo *bo, unsigned int page,
static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo) static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo)
{ {
struct tegra_bo *obj = host1x_to_drm_bo(bo); struct tegra_bo *obj = host1x_to_tegra_bo(bo);
struct drm_device *drm = obj->gem.dev; struct drm_device *drm = obj->gem.dev;
mutex_lock(&drm->struct_mutex); mutex_lock(&drm->struct_mutex);
@ -140,9 +140,9 @@ err_dma:
} }
struct tegra_bo *tegra_bo_create_with_handle(struct drm_file *file, struct tegra_bo *tegra_bo_create_with_handle(struct drm_file *file,
struct drm_device *drm, struct drm_device *drm,
unsigned int size, unsigned int size,
unsigned int *handle) unsigned int *handle)
{ {
struct tegra_bo *bo; struct tegra_bo *bo;
int ret; int ret;
@ -169,7 +169,6 @@ void tegra_bo_free_object(struct drm_gem_object *gem)
struct tegra_bo *bo = to_tegra_bo(gem); struct tegra_bo *bo = to_tegra_bo(gem);
drm_gem_free_mmap_offset(gem); drm_gem_free_mmap_offset(gem);
drm_gem_object_release(gem); drm_gem_object_release(gem);
tegra_bo_destroy(gem->dev, bo); tegra_bo_destroy(gem->dev, bo);
@ -189,7 +188,7 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
args->size = args->pitch * args->height; args->size = args->pitch * args->height;
bo = tegra_bo_create_with_handle(file, drm, args->size, bo = tegra_bo_create_with_handle(file, drm, args->size,
&args->handle); &args->handle);
if (IS_ERR(bo)) if (IS_ERR(bo))
return PTR_ERR(bo); return PTR_ERR(bo);