From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: linux-aspeed@lists.ozlabs.org, Andrew Jeffery <andrew@aj.id.au>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Joel Stanley <joel@jms.id.au>,
Daniel Vetter <daniel.vetter@intel.com>,
Sam Ravnborg <sam@ravnborg.org>,
linux-arm-kernel@lists.infradead.org
Subject: [Intel-gfx] [PATCH 03/24] drm/aspeed: Use managed drmm_mode_config_cleanup
Date: Fri, 4 Sep 2020 16:39:20 +0200 [thread overview]
Message-ID: <20200904143941.110665-4-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20200904143941.110665-1-daniel.vetter@ffwll.ch>
Since aspeed doesn't use devm_kzalloc anymore we can use the managed
mode config cleanup.
v2: Keep call order as suggested by Sam.
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Joel Stanley <joel@jms.id.au>
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: linux-aspeed@lists.ozlabs.org
Cc: linux-arm-kernel@lists.infradead.org
---
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
index 903f4f304647..2b424b2b85cc 100644
--- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
+++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
@@ -63,15 +63,21 @@ static const struct drm_mode_config_funcs aspeed_gfx_mode_config_funcs = {
.atomic_commit = drm_atomic_helper_commit,
};
-static void aspeed_gfx_setup_mode_config(struct drm_device *drm)
+static int aspeed_gfx_setup_mode_config(struct drm_device *drm)
{
- drm_mode_config_init(drm);
+ int ret;
+
+ ret = drmm_mode_config_init(drm);
+ if (ret)
+ return ret;
drm->mode_config.min_width = 0;
drm->mode_config.min_height = 0;
drm->mode_config.max_width = 800;
drm->mode_config.max_height = 600;
drm->mode_config.funcs = &aspeed_gfx_mode_config_funcs;
+
+ return ret;
}
static irqreturn_t aspeed_gfx_irq_handler(int irq, void *data)
@@ -144,7 +150,9 @@ static int aspeed_gfx_load(struct drm_device *drm)
writel(0, priv->base + CRT_CTRL1);
writel(0, priv->base + CRT_CTRL2);
- aspeed_gfx_setup_mode_config(drm);
+ ret = aspeed_gfx_setup_mode_config(drm);
+ if (ret < 0)
+ return ret;
ret = drm_vblank_init(drm, 1);
if (ret < 0) {
@@ -179,7 +187,6 @@ static int aspeed_gfx_load(struct drm_device *drm)
static void aspeed_gfx_unload(struct drm_device *drm)
{
drm_kms_helper_poll_fini(drm);
- drm_mode_config_cleanup(drm);
}
DEFINE_DRM_GEM_CMA_FOPS(fops);
--
2.28.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-09-04 14:40 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 14:39 [Intel-gfx] [PATCH 00/24] drm_managed, leftovers Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 01/24] drm/armada: Use devm_drm_dev_alloc Daniel Vetter
2020-09-10 1:20 ` Dave Airlie
2020-09-04 14:39 ` [Intel-gfx] [PATCH 02/24] drm/armada: Don't use drm_device->dev_private Daniel Vetter
2020-09-04 14:39 ` Daniel Vetter [this message]
2020-09-04 14:39 ` [Intel-gfx] [PATCH 04/24] drm/vgem: Use devm_drm_dev_alloc Daniel Vetter
2020-09-09 11:01 ` Melissa Wen
2020-09-09 11:20 ` Daniel Vetter
2020-09-09 16:29 ` Melissa Wen
2020-09-09 12:07 ` [Intel-gfx] [PATCH] " Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 05/24] drm/vkms: " Daniel Vetter
2020-09-08 23:42 ` Melissa Wen
2020-09-09 9:18 ` [Intel-gfx] [PATCH] " Daniel Vetter
2020-09-09 9:22 ` Melissa Wen
2020-09-04 14:39 ` [Intel-gfx] [PATCH 06/24] drm/xlnx: " Daniel Vetter
2020-09-07 8:22 ` [Intel-gfx] [PATCH] " Daniel Vetter
2020-09-08 19:16 ` Hyun Kwon
2020-09-11 8:47 ` Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 07/24] drm/i915/selftest: Create mock_destroy_device Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 08/24] drm/i915/selftests: align more to real device lifetimes Daniel Vetter
2020-09-11 8:59 ` Maarten Lankhorst
2020-09-11 9:08 ` Matthew Auld
2020-09-04 14:39 ` [Intel-gfx] [PATCH 09/24] drm/dev: Remove drm_dev_init Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 10/24] drm/arc: Switch to devm_drm_dev_alloc Daniel Vetter
2020-10-23 12:31 ` Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 11/24] drm/arc: Stop using drm_device->dev_private Daniel Vetter
2020-09-04 15:09 ` Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 12/24] drm/arc: Delete arcpgu_priv->fb Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 13/24] drm/arc: Embedded a drm_simple_display_pipe Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 14/24] drm/arc: Embedd a drm_connector for sim case Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 15/24] drm/arc: Drop surplus connector registration Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 16/24] drm/arc: Use drmm_mode_config_cleanup Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 17/24] drm/arc: Align with simple pipe helpers Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 18/24] drm/arc: Convert to drm_simple_kms_pipe_helper Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 19/24] drm/arc: Drop crtc check in arc_pgu_update Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 20/24] drm/arc: Inline arcpgu_crtc.c Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 21/24] drm/arc: Inline arcpgu_drm_hdmi_init Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 22/24] drm/arc: Inline remaining files Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 23/24] drm/arc: Initialize sim connector before display pipe Daniel Vetter
2020-09-04 14:39 ` [Intel-gfx] [PATCH 24/24] drm/arc: Move to drm/tiny Daniel Vetter
2020-09-09 7:54 ` Thomas Zimmermann
2020-09-04 15:08 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm_managed, leftovers Patchwork
2020-09-04 15:09 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-09-04 15:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-09-05 3:03 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-09-07 9:19 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm_managed, leftovers (rev2) Patchwork
2020-09-07 9:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2020-09-07 9:36 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-09-09 9:45 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm_managed, leftovers (rev3) Patchwork
2020-09-09 12:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm_managed, leftovers (rev4) Patchwork
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=20200904143941.110665-4-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=andrew@aj.id.au \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=joel@jms.id.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=sam@ravnborg.org \
/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