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 12/14] drm/ast: Replace struct ast_crtc with struct drm_crtc
Date: Tue, 23 Jun 2020 10:18:59 +0200 [thread overview]
Message-ID: <20200623081901.10667-13-tzimmermann@suse.de> (raw)
In-Reply-To: <20200623081901.10667-1-tzimmermann@suse.de>
Struct ast_crtc has been cleaned up and it's now a wrapper around the
DRM CRTC structure struct drm_crtc. This patch converts the driver to
struct drm_crtc and removes struct ast_crtc.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/ast/ast_drv.h | 5 -----
drivers/gpu/drm/ast/ast_mode.c | 11 ++++++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index ea4de3dce2c4..77226e2fd7c0 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -238,11 +238,6 @@ struct ast_connector {
struct ast_i2c_chan *i2c;
};
-struct ast_crtc {
- struct drm_crtc base;
-};
-
-#define to_ast_crtc(x) container_of(x, struct ast_crtc, base)
#define to_ast_connector(x) container_of(x, struct ast_connector, base)
struct ast_vbios_stdtable {
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 89d9ee0a9e81..43c9686ba0f7 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -881,21 +881,22 @@ static const struct drm_crtc_funcs ast_crtc_funcs = {
static int ast_crtc_init(struct drm_device *dev)
{
struct ast_private *ast = to_ast_private(dev);
- struct ast_crtc *crtc;
+ struct drm_crtc *crtc;
int ret;
- crtc = kzalloc(sizeof(struct ast_crtc), GFP_KERNEL);
+ crtc = kzalloc(sizeof(*crtc), GFP_KERNEL);
if (!crtc)
return -ENOMEM;
- ret = drm_crtc_init_with_planes(dev, &crtc->base, &ast->primary_plane,
+ ret = drm_crtc_init_with_planes(dev, crtc, &ast->primary_plane,
&ast->cursor_plane, &ast_crtc_funcs,
NULL);
if (ret)
goto err_kfree;
- drm_mode_crtc_set_gamma_size(&crtc->base, 256);
- drm_crtc_helper_add(&crtc->base, &ast_crtc_helper_funcs);
+ drm_mode_crtc_set_gamma_size(crtc, 256);
+ drm_crtc_helper_add(crtc, &ast_crtc_helper_funcs);
+
return 0;
err_kfree:
--
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 ` [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 ` Thomas Zimmermann [this message]
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-13-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).