On Thu, Feb 27, 2020 at 07:15:00PM +0100, Daniel Vetter wrote:
> We can even delete the drm_driver.release hook now!
>
> This is made possible by a preceeding patch which added a drmm_
> cleanup action to drm_mode_config_init(), hence all we need to do to
> ensure that drm_mode_config_cleanup() is run on final drm_device
> cleanup is check the new error code for _init().
>
> v2: Explain why this cleanup is possible (Laurent).
>
> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> Cc: Dave Airlie <airlied@xxxxxxxxxx>
> Cc: Gerd Hoffmann <kraxel@xxxxxxxxxx>
> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
> Cc: "Noralf Trønnes" <noralf@xxxxxxxxxxx>
> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
> Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
> Cc: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
But as stated in other post - using drmm_mode_config_init()
would make this more readable.
Sam
> ---
> drivers/gpu/drm/cirrus/cirrus.c | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cirrus.c
> index a9d789a56536..6ac0286810ec 100644
> --- a/drivers/gpu/drm/cirrus/cirrus.c
> +++ b/drivers/gpu/drm/cirrus/cirrus.c
> @@ -510,11 +510,15 @@ static const struct drm_mode_config_funcs cirrus_mode_config_funcs = {
> .atomic_commit = drm_atomic_helper_commit,
> };
>
> -static void cirrus_mode_config_init(struct cirrus_device *cirrus)
> +static int cirrus_mode_config_init(struct cirrus_device *cirrus)
> {
> struct drm_device *dev = &cirrus->dev;
> + int ret;
> +
> + ret = drm_mode_config_init(dev);
> + if (ret)
> + return ret;
>
> - drm_mode_config_init(dev);
> dev->mode_config.min_width = 0;
> dev->mode_config.min_height = 0;
> dev->mode_config.max_width = CIRRUS_MAX_PITCH / 2;
> @@ -522,15 +526,12 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus)
> dev->mode_config.preferred_depth = 16;
> dev->mode_config.prefer_shadow = 0;
> dev->mode_config.funcs = &cirrus_mode_config_funcs;
> +
> + return 0;
> }
>
> /* ------------------------------------------------------------------ */
>
> -static void cirrus_release(struct drm_device *dev)
> -{
> - drm_mode_config_cleanup(dev);
> -}
> -
> DEFINE_DRM_GEM_FOPS(cirrus_fops);
>
> static struct drm_driver cirrus_driver = {
> @@ -544,7 +545,6 @@ static struct drm_driver cirrus_driver = {
>
> .fops = &cirrus_fops,
> DRM_GEM_SHMEM_DRIVER_OPS,
> - .release = cirrus_release,
> };
>
> static int cirrus_pci_probe(struct pci_dev *pdev,
> @@ -591,7 +591,9 @@ static int cirrus_pci_probe(struct pci_dev *pdev,
> if (cirrus->mmio == NULL)
> goto err_unmap_vram;
>
> - cirrus_mode_config_init(cirrus);
> + ret = cirrus_mode_config_init(cirrus);
> + if (ret)
> + goto err_cleanup;
>
> ret = cirrus_conn_init(cirrus);
> if (ret < 0)
> @@ -613,7 +615,6 @@ static int cirrus_pci_probe(struct pci_dev *pdev,
> return 0;
>
> err_cleanup:
> - drm_mode_config_cleanup(dev);
> iounmap(cirrus->mmio);
> err_unmap_vram:
> iounmap(cirrus->vram);
> --
> 2.24.1
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
