From nobody Fri Apr 3 08:26:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D47B4C6FA89 for ; Thu, 15 Sep 2022 00:33:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230189AbiIOAdF (ORCPT ); Wed, 14 Sep 2022 20:33:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230146AbiIOAcx (ORCPT ); Wed, 14 Sep 2022 20:32:53 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FE7C8A1E0 for ; Wed, 14 Sep 2022 17:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663201963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d5wQaZFEzn9uIXApEc4pGB3KbziveTZ08VHPOZH9w9g=; b=b1DSYVCPqWqp9ZafBKaQPfmx/U8ZtBEKwhdul3pkxW2vv5I5CNozYn1MboDRlIhSRHiIrt tNjelMGEEJVeen1tzPmuB73wrtpdBesgR0NkIBJSy1WmqAaQJsPLQ/3dgh2ZFMXw9VJ0mU 6EzJJ7c9tqzYbXsjvZ9wLFEc3HQPh9s= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-67-GrUKHXWiORKsvJG0gcHmzg-1; Wed, 14 Sep 2022 20:32:42 -0400 X-MC-Unique: GrUKHXWiORKsvJG0gcHmzg-1 Received: by mail-ed1-f69.google.com with SMTP id i17-20020a05640242d100b0044f18a5379aso12060034edc.21 for ; Wed, 14 Sep 2022 17:32:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=d5wQaZFEzn9uIXApEc4pGB3KbziveTZ08VHPOZH9w9g=; b=H3LhwxgQJPxf7F8SP7rBfjMBYu+U8En/IC9wrrtg6uGyuaNdGK4lMRWK9MJ1iYsRvr Iacng1BDwiNkCpz6M1zeRviGe3/0oSBveeX2s/UzStSR8tPFdJq/RXg4feV8vUHooCXx ij3NIlWEbhjDcllYADaWkuxqV5FskGEVUKT60s1TWvheyp0/NStSXeKdcXz/zm7UD7OT 8Sf0B0Wact/3yovbT9kKbG10xqr1E4o+gyzgr1YFskGuMKf8DaJ7k2Sp/Uk+hKPbZ2Dq asqsrVr3tWN+z/W2VTjsK/hyg23QMImHL9yvK5iyXD+9jDLcq9OiD7T1HfsTKg3pTVKH xEjw== X-Gm-Message-State: ACgBeo0pRODnspu8AekYu0PqbWkMPQie61JT66dT6Oz8zxkGMtkCjy3p C94Cd4M0+NwGDUzIpb/MOL6aBtHRy0JJTeqdUtfSvjs6AytcwzQoAa29tlvaDLe5KC0zTjIfZ4c WUYVSn+uwRWtLpu8fd0y27GTa X-Received: by 2002:a05:6402:22b6:b0:452:2682:a97d with SMTP id cx22-20020a05640222b600b004522682a97dmr11882530edb.309.1663201961083; Wed, 14 Sep 2022 17:32:41 -0700 (PDT) X-Google-Smtp-Source: AA6agR6/3UapABdzNolXQ2vgP3OvvIR9P2YBUWHPoDcwqjn2120CzBCoHv/jPhXemxEraXSszKCo4w== X-Received: by 2002:a05:6402:22b6:b0:452:2682:a97d with SMTP id cx22-20020a05640222b600b004522682a97dmr11882521edb.309.1663201960830; Wed, 14 Sep 2022 17:32:40 -0700 (PDT) Received: from pollux.redhat.com ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id i5-20020a170906698500b007081282cbd8sm8185342ejr.76.2022.09.14.17.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 17:32:39 -0700 (PDT) From: Danilo Krummrich To: daniel@ffwll.ch, airlied@linux.ie, tzimmermann@suse.de, mripard@kernel.org, stefan@agner.ch, alison.wang@nxp.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next 1/8] drm/fsl-dcu: use drmm_* to allocate driver structures Date: Thu, 15 Sep 2022 02:32:24 +0200 Message-Id: <20220915003231.363447-2-dakr@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220915003231.363447-1-dakr@redhat.com> References: <20220915003231.363447-1-dakr@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use drm managed resources to allocate driver structures and get rid of the deprecated drm_dev_alloc() call and replace it with devm_drm_dev_alloc(). This also serves as preparation to get rid of drm_device->dev_private and to fix use-after-free issues on driver unload. Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 7 ++--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 30 +++++++++------------- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 19 +++++++------- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 8 +++--- 5 files changed, 31 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c b/drivers/gpu/drm/f= sl-dcu/fsl_dcu_drm_crtc.c index 2af60d98f48f..a1b8ce70928a 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c @@ -171,15 +171,16 @@ int fsl_dcu_drm_crtc_create(struct fsl_dcu_drm_device= *fsl_dev) { struct drm_plane *primary; struct drm_crtc *crtc =3D &fsl_dev->crtc; + struct drm_device *drm =3D &fsl_dev->base; int ret; =20 - fsl_dcu_drm_init_planes(fsl_dev->drm); + fsl_dcu_drm_init_planes(drm); =20 - primary =3D fsl_dcu_drm_primary_create_plane(fsl_dev->drm); + primary =3D fsl_dcu_drm_primary_create_plane(drm); if (!primary) return -ENOMEM; =20 - ret =3D drm_crtc_init_with_planes(fsl_dev->drm, crtc, primary, NULL, + ret =3D drm_crtc_init_with_planes(drm, crtc, primary, NULL, &fsl_dcu_drm_crtc_funcs, NULL); if (ret) { primary->funcs->destroy(primary); diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fs= l-dcu/fsl_dcu_drm_drv.c index b4acc3422ba4..a47b72995fcf 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -168,6 +168,7 @@ static const struct drm_driver fsl_dcu_drm_driver =3D { static int fsl_dcu_drm_pm_suspend(struct device *dev) { struct fsl_dcu_drm_device *fsl_dev =3D dev_get_drvdata(dev); + struct drm_device *drm =3D &fsl_dev->base; int ret; =20 if (!fsl_dev) @@ -175,7 +176,7 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev) =20 disable_irq(fsl_dev->irq); =20 - ret =3D drm_mode_config_helper_suspend(fsl_dev->drm); + ret =3D drm_mode_config_helper_suspend(drm); if (ret) { enable_irq(fsl_dev->irq); return ret; @@ -189,6 +190,7 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev) static int fsl_dcu_drm_pm_resume(struct device *dev) { struct fsl_dcu_drm_device *fsl_dev =3D dev_get_drvdata(dev); + struct drm_device *drm =3D &fsl_dev->base; int ret; =20 if (!fsl_dev) @@ -202,10 +204,10 @@ static int fsl_dcu_drm_pm_resume(struct device *dev) =20 if (fsl_dev->tcon) fsl_tcon_bypass_enable(fsl_dev->tcon); - fsl_dcu_drm_init_planes(fsl_dev->drm); + fsl_dcu_drm_init_planes(drm); enable_irq(fsl_dev->irq); =20 - drm_mode_config_helper_resume(fsl_dev->drm); + drm_mode_config_helper_resume(drm); =20 return 0; } @@ -255,9 +257,10 @@ static int fsl_dcu_drm_probe(struct platform_device *p= dev) int ret; u8 div_ratio_shift =3D 0; =20 - fsl_dev =3D devm_kzalloc(dev, sizeof(*fsl_dev), GFP_KERNEL); - if (!fsl_dev) - return -ENOMEM; + fsl_dev =3D devm_drm_dev_alloc(dev, &fsl_dcu_drm_driver, + typeof(*fsl_dev), base); + if (IS_ERR(fsl_dev)) + return PTR_ERR(fsl_dev); =20 id =3D of_match_node(fsl_dcu_of_match, pdev->dev.of_node); if (!id) @@ -317,28 +320,19 @@ static int fsl_dcu_drm_probe(struct platform_device *= pdev) =20 fsl_dev->tcon =3D fsl_tcon_init(dev); =20 - drm =3D drm_dev_alloc(&fsl_dcu_drm_driver, dev); - if (IS_ERR(drm)) { - ret =3D PTR_ERR(drm); - goto unregister_pix_clk; - } - fsl_dev->dev =3D dev; - fsl_dev->drm =3D drm; fsl_dev->np =3D dev->of_node; drm->dev_private =3D fsl_dev; dev_set_drvdata(dev, fsl_dev); =20 ret =3D drm_dev_register(drm, 0); if (ret < 0) - goto put; + goto unregister_pix_clk; =20 drm_fbdev_generic_setup(drm, legacyfb_depth); =20 return 0; =20 -put: - drm_dev_put(drm); unregister_pix_clk: clk_unregister(fsl_dev->pix_clk); disable_clk: @@ -349,9 +343,9 @@ static int fsl_dcu_drm_probe(struct platform_device *pd= ev) static int fsl_dcu_drm_remove(struct platform_device *pdev) { struct fsl_dcu_drm_device *fsl_dev =3D platform_get_drvdata(pdev); + struct drm_device *drm =3D &fsl_dev->base; =20 - drm_dev_unregister(fsl_dev->drm); - drm_dev_put(fsl_dev->drm); + drm_dev_unregister(drm); clk_disable_unprepare(fsl_dev->clk); clk_unregister(fsl_dev->pix_clk); =20 diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h b/drivers/gpu/drm/fs= l-dcu/fsl_dcu_drm_drv.h index e2049a0e8a92..20ca13ff618a 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h @@ -177,6 +177,7 @@ struct fsl_dcu_soc_data { }; =20 struct fsl_dcu_drm_device { + struct drm_device base; struct device *dev; struct device_node *np; struct regmap *regmap; @@ -186,7 +187,6 @@ struct fsl_dcu_drm_device { struct fsl_tcon *tcon; /*protects hardware register*/ spinlock_t irq_lock; - struct drm_device *drm; struct drm_crtc crtc; struct drm_encoder encoder; struct fsl_dcu_drm_connector connector; diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c b/drivers/gpu/drm/fs= l-dcu/fsl_dcu_drm_kms.c index 5b47000738e4..c3d55c0aca9f 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c @@ -20,15 +20,16 @@ static const struct drm_mode_config_funcs fsl_dcu_drm_m= ode_config_funcs =3D { =20 int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev) { + struct drm_device *drm =3D &fsl_dev->base; int ret; =20 - drm_mode_config_init(fsl_dev->drm); + drm_mode_config_init(drm); =20 - fsl_dev->drm->mode_config.min_width =3D 0; - fsl_dev->drm->mode_config.min_height =3D 0; - fsl_dev->drm->mode_config.max_width =3D 2031; - fsl_dev->drm->mode_config.max_height =3D 2047; - fsl_dev->drm->mode_config.funcs =3D &fsl_dcu_drm_mode_config_funcs; + drm->mode_config.min_width =3D 0; + drm->mode_config.min_height =3D 0; + drm->mode_config.max_width =3D 2031; + drm->mode_config.max_height =3D 2047; + drm->mode_config.funcs =3D &fsl_dcu_drm_mode_config_funcs; =20 ret =3D fsl_dcu_drm_crtc_create(fsl_dev); if (ret) @@ -42,12 +43,12 @@ int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device = *fsl_dev) if (ret) goto err; =20 - drm_mode_config_reset(fsl_dev->drm); - drm_kms_helper_poll_init(fsl_dev->drm); + drm_mode_config_reset(drm); + drm_kms_helper_poll_init(drm); =20 return 0; =20 err: - drm_mode_config_cleanup(fsl_dev->drm); + drm_mode_config_cleanup(drm); return ret; } diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fs= l-dcu/fsl_dcu_drm_rgb.c index 4d4a715b429d..b9b02f617cd2 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c @@ -22,6 +22,7 @@ int fsl_dcu_drm_encoder_create(struct fsl_dcu_drm_device = *fsl_dev, struct drm_crtc *crtc) { struct drm_encoder *encoder =3D &fsl_dev->encoder; + struct drm_device *drm =3D &fsl_dev->base; int ret; =20 encoder->possible_crtcs =3D 1; @@ -30,8 +31,7 @@ int fsl_dcu_drm_encoder_create(struct fsl_dcu_drm_device = *fsl_dev, if (fsl_dev->tcon) fsl_tcon_bypass_enable(fsl_dev->tcon); =20 - ret =3D drm_simple_encoder_init(fsl_dev->drm, encoder, - DRM_MODE_ENCODER_LVDS); + ret =3D drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_LVDS); if (ret < 0) return ret; =20 @@ -79,12 +79,12 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_devi= ce *fsl_dev, { struct drm_encoder *encoder =3D &fsl_dev->encoder; struct drm_connector *connector =3D &fsl_dev->connector.base; + struct drm_device *drm =3D &fsl_dev->base; int ret; =20 fsl_dev->connector.encoder =3D encoder; =20 - ret =3D drm_connector_init(fsl_dev->drm, connector, - &fsl_dcu_drm_connector_funcs, + ret =3D drm_connector_init(drm, connector, &fsl_dcu_drm_connector_funcs, DRM_MODE_CONNECTOR_LVDS); if (ret < 0) return ret; --=20 2.37.3