From: Varad Gautam <varadgautam@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Varad Gautam <varad.gautam@collabora.com>
Subject: [PATCH 07/12] drm/cirrus: use universal plane interfaces for primary plane
Date: Fri, 8 Sep 2017 19:05:12 +0530 [thread overview]
Message-ID: <20170908133517.18715-8-varadgautam@gmail.com> (raw)
In-Reply-To: <20170908133517.18715-1-varadgautam@gmail.com>
From: Varad Gautam <varad.gautam@collabora.com>
cirrus exposes one legacy primary plane tied to the crtc. convert this to
use the universal planes interface in preparation for atomic.
v2: avoid early plane cleanup to fix faulty error handling. (krisman)
Signed-off-by: Varad Gautam <varad.gautam@collabora.com>
Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
---
drivers/gpu/drm/cirrus/cirrus_mode.c | 45 +++++++++++++++++++++++++++++++++++-
1 file changed, 44 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c
index 6a8d09c9a36b..d12399986c81 100644
--- a/drivers/gpu/drm/cirrus/cirrus_mode.c
+++ b/drivers/gpu/drm/cirrus/cirrus_mode.c
@@ -348,11 +348,29 @@ static const struct drm_crtc_helper_funcs cirrus_helper_funcs = {
.commit = cirrus_crtc_commit,
};
+static const uint32_t cirrus_plane_formats[] = {
+ DRM_FORMAT_XRGB8888,
+ DRM_FORMAT_ARGB8888,
+ DRM_FORMAT_RGB888,
+ DRM_FORMAT_RGB565,
+};
+
+static const struct drm_plane_funcs cirrus_plane_funcs = {
+ .update_plane = drm_primary_helper_update,
+ .disable_plane = drm_primary_helper_disable,
+ .destroy = drm_primary_helper_destroy,
+};
+
+static const struct drm_plane_helper_funcs cirrus_plane_helper_funcs = {
+};
+
/* CRTC setup */
static void cirrus_crtc_init(struct drm_device *dev)
{
struct cirrus_device *cdev = dev->dev_private;
struct cirrus_crtc *cirrus_crtc;
+ struct drm_plane *primary;
+ int ret;
cirrus_crtc = kzalloc(sizeof(struct cirrus_crtc) +
(CIRRUSFB_CONN_LIMIT * sizeof(struct drm_connector *)),
@@ -361,12 +379,37 @@ static void cirrus_crtc_init(struct drm_device *dev)
if (cirrus_crtc == NULL)
return;
- drm_crtc_init(dev, &cirrus_crtc->base, &cirrus_crtc_funcs);
+ primary = kzalloc(sizeof(*primary), GFP_KERNEL);
+ if (primary == NULL)
+ goto cleanup_crtc;
+ drm_plane_helper_add(primary, &cirrus_plane_helper_funcs);
+ ret = drm_universal_plane_init(dev, primary, 1,
+ &cirrus_plane_funcs,
+ cirrus_plane_formats,
+ ARRAY_SIZE(cirrus_plane_formats),
+ NULL, DRM_PLANE_TYPE_PRIMARY, NULL);
+ if (ret) {
+ kfree(primary);
+ goto cleanup_crtc;
+ }
+
+ ret = drm_crtc_init_with_planes(dev, &cirrus_crtc->base, primary, NULL,
+ &cirrus_crtc_funcs, NULL);
+ if (ret)
+ goto cleanup;
drm_mode_crtc_set_gamma_size(&cirrus_crtc->base, CIRRUS_LUT_SIZE);
cdev->mode_info.crtc = cirrus_crtc;
drm_crtc_helper_add(&cirrus_crtc->base, &cirrus_helper_funcs);
+ return;
+
+cleanup:
+ drm_plane_cleanup(primary);
+ kfree(primary);
+cleanup_crtc:
+ kfree(cirrus_crtc);
+ return;
}
static void cirrus_encoder_mode_set(struct drm_encoder *encoder,
--
2.13.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2017-09-08 13:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-08 13:35 [PATCH 00/12] atomic modesetting for cirrus v2 Varad Gautam
2017-09-08 13:35 ` [PATCH 01/12] drm/cirrus: split out bo unpinning from cirrus_bo_push_sysram Varad Gautam
2017-09-08 13:35 ` [PATCH 02/12] drm/cirrus: add drm_read to cirrus_driver_fops Varad Gautam
2017-09-08 13:35 ` [PATCH 03/12] drm/cirrus: do not disable outputs on fbdev init for atomic Varad Gautam
2017-09-08 13:35 ` [PATCH 04/12] drm/cirrus: initialize start and size fields Varad Gautam
2017-09-11 8:23 ` Gerd Hoffmann
2017-09-08 13:35 ` [PATCH 05/12] drm/cirrus: hardcode vram size Varad Gautam
2017-09-11 8:31 ` Gerd Hoffmann
2017-09-08 13:35 ` [PATCH 06/12] drm/cirrus: implement PRIME export for cirrus Varad Gautam
2017-09-08 13:35 ` Varad Gautam [this message]
2017-09-08 13:35 ` [PATCH 08/12] drm/cirrus: use atomic transition helpers for plane and crtc Varad Gautam
2017-09-08 13:35 ` [PATCH 09/12] drm/cirrus: send vblank on crtc atomic_flush Varad Gautam
2017-09-08 13:35 ` [PATCH 10/12] drm/cirrus: use atomic handlers for plane and crtc Varad Gautam
2017-09-08 13:35 ` [PATCH 11/12] drm/cirrus: implement atomic hardware cursor support Varad Gautam
2017-09-11 8:37 ` Gerd Hoffmann
2017-09-08 13:35 ` [PATCH 12/12] drm/cirrus: advertise DRIVER_ATOMIC Varad Gautam
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=20170908133517.18715-8-varadgautam@gmail.com \
--to=varadgautam@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=varad.gautam@collabora.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).