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 10/14] drm/ast: Managed cursor release
Date: Tue, 23 Jun 2020 10:18:57 +0200 [thread overview]
Message-ID: <20200623081901.10667-11-tzimmermann@suse.de> (raw)
In-Reply-To: <20200623081901.10667-1-tzimmermann@suse.de>
Register a release function to finalize cursors. The _fini() function
gets un-exported from the source file.
The function ast_mode_fini() is now empty and will be removed by a
later patch.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/ast/ast_cursor.c | 38 ++++++++++++++++++--------------
drivers/gpu/drm/ast/ast_drv.h | 1 -
drivers/gpu/drm/ast/ast_mode.c | 3 ---
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/ast/ast_cursor.c b/drivers/gpu/drm/ast/ast_cursor.c
index 35680402e410..acf0d23514e8 100644
--- a/drivers/gpu/drm/ast/ast_cursor.c
+++ b/drivers/gpu/drm/ast/ast_cursor.c
@@ -28,9 +28,30 @@
*/
#include <drm/drm_gem_vram_helper.h>
+#include <drm/drm_managed.h>
#include "ast_drv.h"
+static void ast_cursor_fini(struct ast_private *ast)
+{
+ size_t i;
+ struct drm_gem_vram_object *gbo;
+
+ for (i = 0; i < ARRAY_SIZE(ast->cursor.gbo); ++i) {
+ gbo = ast->cursor.gbo[i];
+ drm_gem_vram_vunmap(gbo, ast->cursor.vaddr[i]);
+ drm_gem_vram_unpin(gbo);
+ drm_gem_vram_put(gbo);
+ }
+}
+
+static void ast_cursor_release(struct drm_device *dev, void *ptr)
+{
+ struct ast_private *ast = dev->dev_private;
+
+ ast_cursor_fini(ast);
+}
+
/*
* Allocate cursor BOs and pins them at the end of VRAM.
*/
@@ -68,7 +89,7 @@ int ast_cursor_init(struct ast_private *ast)
ast->cursor.vaddr[i] = vaddr;
}
- return 0;
+ return drmm_add_action_or_reset(dev, ast_cursor_release, NULL);
err_drm_gem_vram_put:
while (i) {
@@ -77,25 +98,10 @@ int ast_cursor_init(struct ast_private *ast)
drm_gem_vram_vunmap(gbo, ast->cursor.vaddr[i]);
drm_gem_vram_unpin(gbo);
drm_gem_vram_put(gbo);
- ast->cursor.gbo[i] = NULL;
- ast->cursor.vaddr[i] = NULL;
}
return ret;
}
-void ast_cursor_fini(struct ast_private *ast)
-{
- size_t i;
- struct drm_gem_vram_object *gbo;
-
- for (i = 0; i < ARRAY_SIZE(ast->cursor.gbo); ++i) {
- gbo = ast->cursor.gbo[i];
- drm_gem_vram_vunmap(gbo, ast->cursor.vaddr[i]);
- drm_gem_vram_unpin(gbo);
- drm_gem_vram_put(gbo);
- }
-}
-
static void update_cursor_image(u8 __iomem *dst, const u8 *src, int width, int height)
{
union {
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index f465e0c0984b..ea4de3dce2c4 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -317,7 +317,6 @@ void ast_release_firmware(struct drm_device *dev);
/* ast_cursor.c */
int ast_cursor_init(struct ast_private *ast);
-void ast_cursor_fini(struct ast_private *ast);
int ast_cursor_blit(struct ast_private *ast, struct drm_framebuffer *fb);
void ast_cursor_page_flip(struct ast_private *ast);
void ast_cursor_show(struct ast_private *ast, int x, int y,
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 7863a49968b4..4724a38c001a 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -1108,9 +1108,6 @@ int ast_mode_init(struct drm_device *dev)
void ast_mode_fini(struct drm_device *dev)
{
- struct ast_private *ast = dev->dev_private;
-
- ast_cursor_fini(ast);
}
static int get_clock(void *i2c_priv)
--
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 ` [PATCH 04/14] drm/ast: Update cursor image and checksum from same function Thomas Zimmermann
2020-06-23 8:18 ` [PATCH 05/14] drm/ast: Move cursor pageflip into helper 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 ` Thomas Zimmermann [this message]
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-11-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).