leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/ast: Move cursor offset swapping into ast_show_cursor()

Browse Source 
Selecting the correct offset for the new cursor image is not relevant
outside of ast_show_cursor(). Let the function do the work.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190927090309.10254-5-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2019-09-27 11:03:08 +02:00
parent 2f5989fcd1
commit 659d1a49c6
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/gpu/drm/ast/ast_mode.c
View File

@ -1150,23 +1150,34 @@ static void ast_cursor_set_base(struct ast_private *ast, u64 address)
ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xca, addr2); ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xca, addr2);
} }
static int ast_show_cursor(struct drm_crtc *crtc, void *dst, void *src, static int ast_show_cursor(struct drm_crtc *crtc, void *src,
unsigned int width, unsigned int height, unsigned int width, unsigned int height)
u64 dst_gpu)
{ {
struct ast_private *ast = crtc->dev->dev_private; struct ast_private *ast = crtc->dev->dev_private;
struct ast_crtc *ast_crtc = to_ast_crtc(crtc); struct ast_crtc *ast_crtc = to_ast_crtc(crtc);
struct drm_gem_vram_object *gbo;
u8 *dst, *dst_next;
s64 off;
int ret; int ret;
u8 jreg; u8 jreg;
dst += (AST_HWC_SIZE + AST_HWC_SIGNATURE_SIZE)*ast->next_cursor; gbo = drm_gem_vram_of_gem(ast->cursor_cache);
dst = drm_gem_vram_vmap(gbo);
if (IS_ERR(dst))
return PTR_ERR(dst);
off = drm_gem_vram_offset(gbo);
if (off < 0) {
ret = (int)off;
goto err_drm_gem_vram_vunmap;
}
ret = ast_cursor_update(dst, src, width, height); dst_next = dst + (AST_HWC_SIZE + AST_HWC_SIGNATURE_SIZE) *
ast->next_cursor;
ret = ast_cursor_update(dst_next, src, width, height);
if (ret) if (ret)
return ret; goto err_drm_gem_vram_vunmap;
ast_cursor_set_base(ast, dst_gpu); ast_cursor_set_base(ast, off);
ast->next_cursor = (ast->next_cursor + 1) % AST_DEFAULT_HWC_NUM;
ast_crtc->offset_x = AST_MAX_HWC_WIDTH - width; ast_crtc->offset_x = AST_MAX_HWC_WIDTH - width;
ast_crtc->offset_y = AST_MAX_HWC_WIDTH - height; ast_crtc->offset_y = AST_MAX_HWC_WIDTH - height;
@ -1176,7 +1187,15 @@ static int ast_show_cursor(struct drm_crtc *crtc, void *dst, void *src,
jreg |= 1; jreg |= 1;
ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xcb, 0xfc, jreg); ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xcb, 0xfc, jreg);
ast->next_cursor = (ast->next_cursor + 1) % AST_DEFAULT_HWC_NUM;
drm_gem_vram_vunmap(gbo, dst);
return 0; return 0;
err_drm_gem_vram_vunmap:
drm_gem_vram_vunmap(gbo, dst);
return ret;
} }
static void ast_hide_cursor(struct drm_crtc *crtc) static void ast_hide_cursor(struct drm_crtc *crtc)
@ -1192,12 +1211,10 @@ static int ast_cursor_set(struct drm_crtc *crtc,
uint32_t width, uint32_t width,
uint32_t height) uint32_t height)
{ {
struct ast_private *ast = crtc->dev->dev_private;
struct drm_gem_object *obj; struct drm_gem_object *obj;
struct drm_gem_vram_object *gbo; struct drm_gem_vram_object *gbo;
s64 dst_gpu; u8 *src;
int ret; int ret;
u8 *src, *dst;
if (!handle) { if (!handle) {
ast_hide_cursor(crtc); ast_hide_cursor(crtc);
@ -1219,21 +1236,9 @@ static int ast_cursor_set(struct drm_crtc *crtc,
goto err_drm_gem_object_put_unlocked; goto err_drm_gem_object_put_unlocked;
} }
dst = drm_gem_vram_kmap(drm_gem_vram_of_gem(ast->cursor_cache), ret = ast_show_cursor(crtc, src, width, height);
false, NULL);
if (IS_ERR(dst)) {
ret = PTR_ERR(dst);
goto err_drm_gem_vram_vunmap;
}
dst_gpu = drm_gem_vram_offset(drm_gem_vram_of_gem(ast->cursor_cache));
if (dst_gpu < 0) {
ret = (int)dst_gpu;
goto err_drm_gem_vram_vunmap;
}
ret = ast_show_cursor(crtc, dst, src, width, height, dst_gpu);
if (ret) if (ret)
goto err_drm_gem_vram_kunmap; goto err_drm_gem_vram_vunmap;
drm_gem_vram_vunmap(gbo, src); drm_gem_vram_vunmap(gbo, src);
drm_gem_object_put_unlocked(obj); drm_gem_object_put_unlocked(obj);