From: Thomas Zimmermann <tzimmermann@suse.de>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
DRI Development <dri-devel@lists.freedesktop.org>
Cc: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>,
Alexey Brodkin <abrodkin@synopsys.com>,
Sam Ravnborg <sam@ravnborg.org>,
tiantao6@hisilicon.com, Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH 07/15] drm/arc: Use drmm_mode_config_cleanup
Date: Tue, 12 Jan 2021 12:29:59 +0100 [thread overview]
Message-ID: <87d3aaed-dfe7-eb72-7bf5-f39cab5aa858@suse.de> (raw)
In-Reply-To: <20210112084358.2771527-7-daniel.vetter@ffwll.ch>
[-- Attachment #1.1.1: Type: text/plain, Size: 4907 bytes --]
Hi
Am 12.01.21 um 09:43 schrieb Daniel Vetter:
> With autocleanup through drm_device management we can delete all the
> code. Possible now that there's no confusion against devm_kzalloc'ed
> structures anymore.
>
> I inlined arcpgu_setup_mode_config because it's tiny and the newly
> needed return value handling would have been more ...
>
> Acked-by: Sam Ravnborg <sam@ravnborg.org>
> Cc: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Alexey Brodkin <abrodkin@synopsys.com>
> ---
> drivers/gpu/drm/arc/arcpgu_crtc.c | 4 +---
> drivers/gpu/drm/arc/arcpgu_drv.c | 21 +++++++++------------
> drivers/gpu/drm/arc/arcpgu_hdmi.c | 6 +-----
> drivers/gpu/drm/arc/arcpgu_sim.c | 11 ++---------
> 4 files changed, 13 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c
> index 31a85c703307..43313adb1981 100644
> --- a/drivers/gpu/drm/arc/arcpgu_crtc.c
> +++ b/drivers/gpu/drm/arc/arcpgu_crtc.c
> @@ -209,10 +209,8 @@ int arc_pgu_setup_crtc(struct drm_device *drm)
>
> ret = drm_crtc_init_with_planes(drm, &arcpgu->pipe.crtc, primary, NULL,
> &arc_pgu_crtc_funcs, NULL);
> - if (ret) {
> - arc_pgu_plane_destroy(primary);
> + if (ret)
> return ret;
> - }
>
> drm_crtc_helper_add(&arcpgu->pipe.crtc, &arc_pgu_crtc_helper_funcs);
> return 0;
> diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c
> index 9020352816fa..6349e9dc770e 100644
> --- a/drivers/gpu/drm/arc/arcpgu_drv.c
> +++ b/drivers/gpu/drm/arc/arcpgu_drv.c
> @@ -30,16 +30,6 @@ static const struct drm_mode_config_funcs arcpgu_drm_modecfg_funcs = {
> .atomic_commit = drm_atomic_helper_commit,
> };
>
> -static void arcpgu_setup_mode_config(struct drm_device *drm)
> -{
> - drm_mode_config_init(drm);
> - drm->mode_config.min_width = 0;
> - drm->mode_config.min_height = 0;
> - drm->mode_config.max_width = 1920;
> - drm->mode_config.max_height = 1080;
> - drm->mode_config.funcs = &arcpgu_drm_modecfg_funcs;
> -}
> -
> DEFINE_DRM_GEM_CMA_FOPS(arcpgu_drm_ops);
>
> static int arcpgu_load(struct arcpgu_drm_private *arcpgu)
> @@ -54,7 +44,15 @@ static int arcpgu_load(struct arcpgu_drm_private *arcpgu)
> if (IS_ERR(arcpgu->clk))
> return PTR_ERR(arcpgu->clk);
>
> - arcpgu_setup_mode_config(drm);
> + 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 = 1920;
> + drm->mode_config.max_height = 1080;
> + drm->mode_config.funcs = &arcpgu_drm_modecfg_funcs;
It feels wrong to do this before even acquiring I/O memory. I would have
moved all this just before the call to arc_pgu_setup_crtc().
Best regards
Thomas
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> arcpgu->regs = devm_ioremap_resource(&pdev->dev, res);
> @@ -108,7 +106,6 @@ static int arcpgu_unload(struct drm_device *drm)
> {
> drm_kms_helper_poll_fini(drm);
> drm_atomic_helper_shutdown(drm);
> - drm_mode_config_cleanup(drm);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/arc/arcpgu_hdmi.c b/drivers/gpu/drm/arc/arcpgu_hdmi.c
> index dbad2c9237fe..925d6d31bb78 100644
> --- a/drivers/gpu/drm/arc/arcpgu_hdmi.c
> +++ b/drivers/gpu/drm/arc/arcpgu_hdmi.c
> @@ -39,9 +39,5 @@ int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np)
> return ret;
>
> /* Link drm_bridge to encoder */
> - ret = drm_bridge_attach(encoder, bridge, NULL, 0);
> - if (ret)
> - drm_encoder_cleanup(encoder);
> -
> - return ret;
> + return drm_bridge_attach(encoder, bridge, NULL, 0);
> }
> diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c
> index 3772df1647aa..afc34f8b4de0 100644
> --- a/drivers/gpu/drm/arc/arcpgu_sim.c
> +++ b/drivers/gpu/drm/arc/arcpgu_sim.c
> @@ -73,21 +73,14 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
> DRM_MODE_CONNECTOR_VIRTUAL);
> if (ret < 0) {
> dev_err(drm->dev, "failed to initialize drm connector\n");
> - goto error_encoder_cleanup;
> + return ret;
> }
>
> ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0) {
> dev_err(drm->dev, "could not attach connector to encoder\n");
> - goto error_connector_cleanup;
> + return ret;
> }
>
> return 0;
> -
> -error_connector_cleanup:
> - drm_connector_cleanup(connector);
> -
> -error_encoder_cleanup:
> - drm_encoder_cleanup(encoder);
> - return ret;
> }
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-01-12 11:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 8:43 [PATCH 01/15] drm/arc: Switch to devm_drm_dev_alloc Daniel Vetter
2021-01-12 8:43 ` [PATCH 02/15] drm/arc: Stop using drm_device->dev_private Daniel Vetter
2021-01-12 8:43 ` [PATCH 03/15] drm/arc: Delete arcpgu_priv->fb Daniel Vetter
2021-01-12 8:43 ` [PATCH 04/15] drm/arc: Embedded a drm_simple_display_pipe Daniel Vetter
2021-01-12 8:43 ` [PATCH 05/15] drm/arc: Embedd a drm_connector for sim case Daniel Vetter
2021-01-12 8:43 ` [PATCH 06/15] drm/arc: Drop surplus connector registration Daniel Vetter
2021-01-12 8:43 ` [PATCH 07/15] drm/arc: Use drmm_mode_config_cleanup Daniel Vetter
2021-01-12 11:29 ` Thomas Zimmermann [this message]
2021-02-25 11:16 ` Daniel Vetter
2021-01-12 8:43 ` [PATCH 08/15] drm/arc: Align with simple pipe helpers Daniel Vetter
2021-01-12 8:43 ` [PATCH 09/15] drm/arc: Convert to drm_simple_kms_pipe_helper Daniel Vetter
2021-01-12 8:43 ` [PATCH 10/15] drm/arc: Drop crtc check in arc_pgu_update Daniel Vetter
2021-01-12 8:43 ` [PATCH 11/15] drm/arc: Inline arcpgu_crtc.c Daniel Vetter
2021-01-12 8:43 ` [PATCH 12/15] drm/arc: Inline arcpgu_drm_hdmi_init Daniel Vetter
2021-01-12 8:43 ` [PATCH 13/15] drm/arc: Inline remaining files Daniel Vetter
2021-01-12 8:43 ` [PATCH 14/15] drm/arc: Initialize sim connector before display pipe Daniel Vetter
2021-01-12 8:43 ` [PATCH 15/15] drm/arc: Move to drm/tiny Daniel Vetter
2021-01-12 11:42 ` [PATCH 01/15] drm/arc: Switch to devm_drm_dev_alloc Thomas Zimmermann
2021-02-25 12:19 ` Daniel Vetter
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=87d3aaed-dfe7-eb72-7bf5-f39cab5aa858@suse.de \
--to=tzimmermann@suse.de \
--cc=Eugeniy.Paltsev@synopsys.com \
--cc=abrodkin@synopsys.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=sam@ravnborg.org \
--cc=tiantao6@hisilicon.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).