From: Thomas Zimmermann <tzimmermann@suse.de>
To: airlied@redhat.com, daniel@ffwll.ch, noralf@tronnes.org,
kraxel@redhat.com, emil.l.velikov@gmail.com, sam@ravnborg.org,
yc_chen@aspeedtech.com
Cc: Thomas Zimmermann <tzimmermann@suse.de>, dri-devel@lists.freedesktop.org
Subject: [PATCH 04/14] drm/ast: Update cursor image and checksum from same function
Date: Tue, 23 Jun 2020 10:18:51 +0200 [thread overview]
Message-ID: <20200623081901.10667-5-tzimmermann@suse.de> (raw)
In-Reply-To: <20200623081901.10667-1-tzimmermann@suse.de>
Cursor image and checksum go hand in hand. Update both in the same
place. The helper cannot fail, so remove the return type.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/ast/ast_cursor.c | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/ast/ast_cursor.c b/drivers/gpu/drm/ast/ast_cursor.c
index 8f94d4712f66..7474baddf048 100644
--- a/drivers/gpu/drm/ast/ast_cursor.c
+++ b/drivers/gpu/drm/ast/ast_cursor.c
@@ -84,7 +84,7 @@ void ast_cursor_fini(struct ast_private *ast)
}
}
-static u32 copy_cursor_image(u8 *src, u8 *dst, int width, int height)
+static void update_cursor_image(u8 __iomem *dst, const u8 *src, int width, int height)
{
union {
u32 ul;
@@ -96,7 +96,8 @@ static u32 copy_cursor_image(u8 *src, u8 *dst, int width, int height)
} data16;
u32 csum = 0;
s32 alpha_dst_delta, last_alpha_dst_delta;
- u8 *srcxor, *dstxor;
+ u8 __iomem *dstxor;
+ const u8 *srcxor;
int i, j;
u32 per_pixel_copy, two_pixel_copy;
@@ -137,16 +138,6 @@ static u32 copy_cursor_image(u8 *src, u8 *dst, int width, int height)
}
dstxor += last_alpha_dst_delta;
}
- return csum;
-}
-
-static int ast_cursor_update(void *dst, void *src, unsigned int width,
- unsigned int height)
-{
- u32 csum;
-
- /* do data transfer to cursor cache */
- csum = copy_cursor_image(src, dst, width, height);
/* write checksum + signature */
dst += AST_HWC_SIZE;
@@ -155,8 +146,6 @@ static int ast_cursor_update(void *dst, void *src, unsigned int width,
writel(height, dst + AST_HWC_SIGNATURE_SizeY);
writel(0, dst + AST_HWC_SIGNATURE_HOTSPOTX);
writel(0, dst + AST_HWC_SIGNATURE_HOTSPOTY);
-
- return 0;
}
int ast_cursor_blit(struct ast_private *ast, struct drm_framebuffer *fb)
@@ -188,9 +177,8 @@ int ast_cursor_blit(struct ast_private *ast, struct drm_framebuffer *fb)
goto err_drm_gem_vram_vunmap_src;
}
- ret = ast_cursor_update(dst, src, fb->width, fb->height);
- if (ret)
- goto err_drm_gem_vram_vunmap_dst;
+ /* do data transfer to cursor BO */
+ update_cursor_image(dst, src, fb->width, fb->height);
/*
* Always unmap buffers here. Destination buffers are
@@ -203,8 +191,6 @@ int ast_cursor_blit(struct ast_private *ast, struct drm_framebuffer *fb)
return 0;
-err_drm_gem_vram_vunmap_dst:
- drm_gem_vram_vunmap(ast->cursor.gbo[ast->cursor.next_index], dst);
err_drm_gem_vram_vunmap_src:
drm_gem_vram_vunmap(gbo, src);
err_drm_gem_vram_unpin:
--
2.27.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-06-23 8:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 8:18 [PATCH 00/14] drm/ast: Managed modesetting Thomas Zimmermann
2020-06-23 8:18 ` [PATCH 01/14] drm/ast: Move cursor functions to ast_cursor.c Thomas Zimmermann
2020-06-23 16:55 ` Sam Ravnborg
2020-06-24 6:24 ` Thomas Zimmermann
2020-07-02 11:41 ` Thomas Zimmermann
2020-06-23 8:18 ` [PATCH 02/14] drm/ast: Pass struct ast_private instance to cursor init/fini functions Thomas Zimmermann
2020-06-23 16:57 ` Sam Ravnborg
2020-06-23 8:18 ` [PATCH 03/14] drm/ast: Move cursor fb pinning and mapping into helper Thomas Zimmermann
2020-06-23 8:18 ` Thomas Zimmermann [this message]
2020-06-23 8:18 ` [PATCH 05/14] drm/ast: Move cursor pageflip " Thomas Zimmermann
2020-06-23 8:18 ` [PATCH 06/14] drm/ast: Replace ast_cursor_move() with ast_cursor_show() Thomas Zimmermann
2020-06-23 8:18 ` [PATCH 07/14] drm/ast: Don't enable HW cursors twice during atomic update Thomas Zimmermann
2020-06-23 8:18 ` [PATCH 08/14] drm/ast: Add helper to hide cursor Thomas Zimmermann
2020-06-23 8:18 ` [PATCH 09/14] drm/ast: Keep cursor HW BOs mapped Thomas Zimmermann
2020-06-24 7:58 ` kernel test robot
2020-06-23 8:18 ` [PATCH 10/14] drm/ast: Managed cursor release Thomas Zimmermann
2020-06-23 8:18 ` [PATCH 11/14] drm/ast: Init cursors before creating modesetting structures Thomas Zimmermann
2020-06-23 8:18 ` [PATCH 12/14] drm/ast: Replace struct ast_crtc with struct drm_crtc Thomas Zimmermann
2020-06-23 8:19 ` [PATCH 13/14] drm/ast: Use managed mode-config init Thomas Zimmermann
2020-06-23 8:19 ` [PATCH 14/14] drm/ast: Initialize mode setting in ast_mode_config_init() Thomas Zimmermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200623081901.10667-5-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
--cc=kraxel@redhat.com \
--cc=noralf@tronnes.org \
--cc=sam@ravnborg.org \
--cc=yc_chen@aspeedtech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).