Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 05:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/bochs: drop unused gpu_addr arg from bochs_bo_pin()

Browse Source 
It's always NULL, so just remove it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20190111053752.4004-12-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-01-11 06:37:47 +01:00
parent e9af3c6088
commit dde8fb5555
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/bochs/bochs.h
View File

@ -142,7 +142,7 @@ int bochs_dumb_create(struct drm_file *file, struct drm_device *dev,
int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev, int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,
uint32_t handle, uint64_t *offset); uint32_t handle, uint64_t *offset);
int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr); int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag);
int bochs_bo_unpin(struct bochs_bo *bo); int bochs_bo_unpin(struct bochs_bo *bo);
/* bochs_kms.c */ /* bochs_kms.c */

2
drivers/gpu/drm/bochs/bochs_fbdev.c
View File

@ -81,7 +81,7 @@ static int bochsfb_create(struct drm_fb_helper *helper,
if (ret) if (ret)
return ret; return ret;
ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL); ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM);
if (ret) { if (ret) {
DRM_ERROR("failed to pin fbcon\n"); DRM_ERROR("failed to pin fbcon\n");
ttm_bo_unreserve(&bo->bo); ttm_bo_unreserve(&bo->bo);

2
drivers/gpu/drm/bochs/bochs_kms.c
View File

@ -101,7 +101,7 @@ static int bochs_plane_prepare_fb(struct drm_plane *plane,
ret = ttm_bo_reserve(&bo->bo, true, false, NULL); ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
if (ret) if (ret)
return ret; return ret;
ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL); ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM);
ttm_bo_unreserve(&bo->bo); ttm_bo_unreserve(&bo->bo);
return ret; return ret;
} }

11
drivers/gpu/drm/bochs/bochs_mm.c
View File

@ -210,20 +210,13 @@ static void bochs_ttm_placement(struct bochs_bo *bo, int domain)
bo->placement.num_busy_placement = c; bo->placement.num_busy_placement = c;
} }
static inline u64 bochs_bo_gpu_offset(struct bochs_bo *bo) int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag)
{
return bo->bo.offset;
}
int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr)
{ {
struct ttm_operation_ctx ctx = { false, false }; struct ttm_operation_ctx ctx = { false, false };
int i, ret; int i, ret;
if (bo->pin_count) { if (bo->pin_count) {
bo->pin_count++; bo->pin_count++;
if (gpu_addr)
*gpu_addr = bochs_bo_gpu_offset(bo);
return 0; return 0;
} }
@ -235,8 +228,6 @@ int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr)
return ret; return ret;
bo->pin_count = 1; bo->pin_count = 1;
if (gpu_addr)
*gpu_addr = bochs_bo_gpu_offset(bo);
return 0; return 0;
} }