Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: TempError (protection.outlook.com: error in processing during
 lookup of arm.com: DNS Timeout)
From:   Mihail Atanassov <Mihail.Atanassov@arm.com>
To:     "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>
CC:     Mihail Atanassov <Mihail.Atanassov@arm.com>, nd <nd@arm.com>,
        Maxime Ripard <mripard@kernel.org>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Sean Paul <sean@poorly.run>,
        "james qian wang (Arm Technology China)" <james.qian.wang@arm.com>,
        Liviu Dudau <Liviu.Dudau@arm.com>,
        Brian Starkey <Brian.Starkey@arm.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Russell King <linux@armlinux.org.uk>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/3] drm/komeda: Consolidate struct komeda_drv allocations
Thread-Topic: [PATCH 1/3] drm/komeda: Consolidate struct komeda_drv
 allocations
Thread-Index: AQHVesDZif8RFMaQBUOH/Gc/fEStZw==
Date:   Fri, 4 Oct 2019 14:34:37 +0000
Message-ID: <20191004143418.53039-2-mihail.atanassov@arm.com>
References: <20191004143418.53039-1-mihail.atanassov@arm.com>
In-Reply-To: <20191004143418.53039-1-mihail.atanassov@arm.com>
Accept-Language: en-GB, en-US
Content-Language: en-US
Authentication-Results-Original: spf=none (sender IP is )
 smtp.mailfrom=Mihail.Atanassov@arm.com; 
x-ms-exchange-messagesentrepresentingtype: 1
x-ms-publictraffictype: Email
X-MS-Office365-Filtering-Correlation-Id: d97fa052-b3db-41d1-b6fd-08d748d80565
X-MS-Office365-Filtering-HT: Tenant
X-MS-TrafficTypeDiagnostic: VI1PR08MB4288:|VI1PR08MB4288:|AM0PR08MB5153:
x-ms-exchange-transport-forked: True
X-Microsoft-Antispam-PRVS: <AM0PR08MB515331D3CBFF4F88392C3B4E8F9E0@AM0PR08MB5153.eurprd08.prod.outlook.com>
x-checkrecipientrouted: true
x-ms-oob-tlc-oobclassifiers: OLM:185;OLM:185;
x-forefront-prvs: 018093A9B5
X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(4636009)(396003)(346002)(39860400002)(366004)(376002)(136003)(199004)(189003)(1076003)(66066001)(14454004)(66556008)(102836004)(2906002)(5660300002)(478600001)(36756003)(76176011)(26005)(50226002)(3846002)(2501003)(6116002)(11346002)(66446008)(386003)(186003)(64756008)(6506007)(66476007)(8936002)(66946007)(5024004)(14444005)(2616005)(4326008)(256004)(44832011)(81166006)(6512007)(99286004)(486006)(6436002)(5640700003)(8676002)(6486002)(86362001)(25786009)(71190400001)(476003)(6916009)(7736002)(305945005)(71200400001)(446003)(2351001)(54906003)(316002)(52116002)(81156014);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR08MB4288;H:VI1PR08MB4078.eurprd08.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: arm.com does not designate
 permitted sender hosts)
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam-Untrusted: BCL:0;
X-Microsoft-Antispam-Message-Info-Original: 5+c4P3D84usX9SQ0peKaoAbt8WogtBHW2uWJjQV10LzLibcmru/8t1xY0Zy6N60TEka3TtEZiVadgFR4/gHw0WVdrMC3CS0vY52FLz/g+gZxz+es2dy3qjn/wAx5iKIhj4IKT/1VHXcZL6CaRZCGYT+1gVes2KQPgfzStzC++JdwwoRNb60UMPZbm63U4vku7R4Uz3iKxGibSjmRp6I8J2u5/2Y9fzXSi5Iyr4OLUVnovghKVRLZN/HQaSx2iSqp1fXEFy1qqgJT/arehcvOHN+p5bpoYGbjCER8hRk+tGNQK0WduR+T4ML6rcB6YCuOvb0E7ZjFn5W7OYr7CA5YmW8CXVO/YzY42Rcb6V3VCkJcc3zNlaB+jwTcJ2F+gKtxoDCBZAPDMGM4X2a9wSqaVbKR2REnzZrKVm9NaDvM4Xg=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4288
Original-Authentication-Results: spf=none (sender IP is )
 smtp.mailfrom=Mihail.Atanassov@arm.com; 
X-EOPAttributedMessage: 0
X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT014.eop-EUR03.prod.protection.outlook.com
X-Forefront-Antispam-Report: CIP:63.35.35.123;IPV:CAL;SCL:-1;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(346002)(376002)(39860400002)(396003)(136003)(199004)(189003)(356004)(6486002)(186003)(336012)(6506007)(8936002)(66066001)(8746002)(305945005)(316002)(76130400001)(50226002)(7736002)(2616005)(126002)(4326008)(3846002)(6116002)(386003)(26826003)(36906005)(54906003)(476003)(478600001)(2501003)(99286004)(23756003)(50466002)(25786009)(47776003)(11346002)(76176011)(6862004)(86362001)(36756003)(63350400001)(2906002)(8676002)(2351001)(22756006)(5640700003)(70586007)(5660300002)(14444005)(5024004)(446003)(1076003)(486006)(14454004)(81166006)(102836004)(70206006)(6512007)(26005)(81156014);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR08MB5153;H:64aa7808-outbound-1.mta.getcheckrecipient.com;FPR:;SPF:TempError;LANG:en;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;A:1;MX:1;
X-MS-Office365-Filtering-Correlation-Id-Prvs: bde6a659-115a-4591-14f4-08d748d7fb71
NoDisclaimer: True
X-Forefront-PRVS: 018093A9B5
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: XBQJu3tAct/YVpda6kNXp+Ut4aAYid1yOFRSZdPRc5SUj+LLc0WbdGgv56g40hKzGp7Kv4Z8NSk/eCFfRLMSIdwMW7cCo3lWoTZy1TOAQCH3hEDxFCO1bCQna+AotyqxFI6FA0rl56caooBrbORjWJrQj1IBe5jG7dKmtuePgLaA9AHh15x3FPOs2ZKAvt8ZrxI6DcsTqHfixp4bZHZnth+dSVipM7ueLkzrVvndhwzfAzbYYCnW9+YGQuKRGmUGVvoKTKWUFDsPIa55pbaCAofWaELEB0QfOdl1u2U+0epRww3rZjgj9R0OjYSm8enrD4OSFNcJmIjXkdaLxN8vBy/ElsdPrQG4HTjgMb6tMiVYhGCG8geUvNcp97uHzWGP41UWQ+OQoreyjsxYdYp0wOgzXyAgKhol1BaCogHj7Xg=
X-OriginatorOrg: arm.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2019 14:34:53.6041
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: d97fa052-b3db-41d1-b6fd-08d748d80565
X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB5153
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

struct komeda_drv has two pointer members only, and both
it and its members get allocated separately. Since both
members' types are in scope, there's not a lot to gain by
keeping the indirection around.

To avoid double-free issues, provide a barebones ->release()
hook for the driver.

Signed-off-by: Mihail Atanassov <mihail.atanassov@arm.com>
---
 .../gpu/drm/arm/display/komeda/komeda_dev.c   | 21 ++++-------
 .../gpu/drm/arm/display/komeda/komeda_dev.h   |  4 +--
 .../gpu/drm/arm/display/komeda/komeda_drv.c   | 36 +++++++++----------
 .../gpu/drm/arm/display/komeda/komeda_kms.c   | 26 ++++++++------
 .../gpu/drm/arm/display/komeda/komeda_kms.h   |  4 +--
 5 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c b/drivers/gpu/=
drm/arm/display/komeda/komeda_dev.c
index 937a6d4c4865..c84f978cacc3 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c
@@ -179,28 +179,23 @@ static int komeda_parse_dt(struct device *dev, struct=
 komeda_dev *mdev)
 	return ret;
 }
=20
-struct komeda_dev *komeda_dev_create(struct device *dev)
+int komeda_dev_init(struct komeda_dev *mdev, struct device *dev)
 {
 	struct platform_device *pdev =3D to_platform_device(dev);
 	const struct komeda_product_data *product;
-	struct komeda_dev *mdev;
 	struct resource *io_res;
 	int err =3D 0;
=20
 	product =3D of_device_get_match_data(dev);
 	if (!product)
-		return ERR_PTR(-ENODEV);
+		return -ENODEV;
=20
 	io_res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!io_res) {
 		DRM_ERROR("No registers defined.\n");
-		return ERR_PTR(-ENODEV);
+		return -ENODEV;
 	}
=20
-	mdev =3D devm_kzalloc(dev, sizeof(*mdev), GFP_KERNEL);
-	if (!mdev)
-		return ERR_PTR(-ENOMEM);
-
 	mutex_init(&mdev->lock);
=20
 	mdev->dev =3D dev;
@@ -284,16 +279,16 @@ struct komeda_dev *komeda_dev_create(struct device *d=
ev)
 	komeda_debugfs_init(mdev);
 #endif
=20
-	return mdev;
+	return 0;
=20
 disable_clk:
 	clk_disable_unprepare(mdev->aclk);
 err_cleanup:
-	komeda_dev_destroy(mdev);
-	return ERR_PTR(err);
+	komeda_dev_fini(mdev);
+	return err;
 }
=20
-void komeda_dev_destroy(struct komeda_dev *mdev)
+void komeda_dev_fini(struct komeda_dev *mdev)
 {
 	struct device *dev =3D mdev->dev;
 	const struct komeda_dev_funcs *funcs =3D mdev->funcs;
@@ -335,8 +330,6 @@ void komeda_dev_destroy(struct komeda_dev *mdev)
 		devm_clk_put(dev, mdev->aclk);
 		mdev->aclk =3D NULL;
 	}
-
-	devm_kfree(dev, mdev);
 }
=20
 int komeda_dev_resume(struct komeda_dev *mdev)
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/=
drm/arm/display/komeda/komeda_dev.h
index 414200233b64..e392b8ffc372 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h
@@ -213,8 +213,8 @@ komeda_product_match(struct komeda_dev *mdev, u32 targe=
t)
 const struct komeda_dev_funcs *
 d71_identify(u32 __iomem *reg, struct komeda_chip_info *chip);
=20
-struct komeda_dev *komeda_dev_create(struct device *dev);
-void komeda_dev_destroy(struct komeda_dev *mdev);
+int komeda_dev_init(struct komeda_dev *mdev, struct device *dev);
+void komeda_dev_fini(struct komeda_dev *mdev);
=20
 struct komeda_dev *dev_to_mdev(struct device *dev);
=20
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_drv.c b/drivers/gpu/=
drm/arm/display/komeda/komeda_drv.c
index d6c2222c5d33..660181bdc008 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_drv.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_drv.c
@@ -14,15 +14,15 @@
 #include "komeda_kms.h"
=20
 struct komeda_drv {
-	struct komeda_dev *mdev;
-	struct komeda_kms_dev *kms;
+	struct komeda_dev mdev;
+	struct komeda_kms_dev kms;
 };
=20
 struct komeda_dev *dev_to_mdev(struct device *dev)
 {
 	struct komeda_drv *mdrv =3D dev_get_drvdata(dev);
=20
-	return mdrv ? mdrv->mdev : NULL;
+	return mdrv ? &mdrv->mdev : NULL;
 }
=20
 static void komeda_unbind(struct device *dev)
@@ -32,8 +32,8 @@ static void komeda_unbind(struct device *dev)
 	if (!mdrv)
 		return;
=20
-	komeda_kms_detach(mdrv->kms);
-	komeda_dev_destroy(mdrv->mdev);
+	komeda_kms_fini(mdrv->kms);
+	komeda_dev_fini(mdrv->mdev);
=20
 	dev_set_drvdata(dev, NULL);
 	devm_kfree(dev, mdrv);
@@ -48,24 +48,20 @@ static int komeda_bind(struct device *dev)
 	if (!mdrv)
 		return -ENOMEM;
=20
-	mdrv->mdev =3D komeda_dev_create(dev);
-	if (IS_ERR(mdrv->mdev)) {
-		err =3D PTR_ERR(mdrv->mdev);
+	err =3D komeda_dev_init(&mdrv->mdev, dev);
+	if (err)
 		goto free_mdrv;
-	}
=20
-	mdrv->kms =3D komeda_kms_attach(mdrv->mdev);
-	if (IS_ERR(mdrv->kms)) {
-		err =3D PTR_ERR(mdrv->kms);
-		goto destroy_mdev;
-	}
+	err =3D komeda_kms_init(&mdrv->kms, &mdrv->mdev);
+	if (err)
+		goto fini_mdev;
=20
 	dev_set_drvdata(dev, mdrv);
=20
 	return 0;
=20
-destroy_mdev:
-	komeda_dev_destroy(mdrv->mdev);
+fini_mdev:
+	komeda_dev_fini(&mdrv->mdev);
=20
 free_mdrv:
 	devm_kfree(dev, mdrv);
@@ -140,12 +136,12 @@ MODULE_DEVICE_TABLE(of, komeda_of_match);
 static int __maybe_unused komeda_pm_suspend(struct device *dev)
 {
 	struct komeda_drv *mdrv =3D dev_get_drvdata(dev);
-	struct drm_device *drm =3D &mdrv->kms->base;
+	struct drm_device *drm =3D &mdrv->kms.base;
 	int res;
=20
 	res =3D drm_mode_config_helper_suspend(drm);
=20
-	komeda_dev_suspend(mdrv->mdev);
+	komeda_dev_suspend(&mdrv->mdev);
=20
 	return res;
 }
@@ -153,9 +149,9 @@ static int __maybe_unused komeda_pm_suspend(struct devi=
ce *dev)
 static int __maybe_unused komeda_pm_resume(struct device *dev)
 {
 	struct komeda_drv *mdrv =3D dev_get_drvdata(dev);
-	struct drm_device *drm =3D &mdrv->kms->base;
+	struct drm_device *drm =3D &mdrv->kms.base;
=20
-	komeda_dev_resume(mdrv->mdev);
+	komeda_dev_resume(&mdrv->mdev);
=20
 	return drm_mode_config_helper_resume(drm);
 }
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/=
drm/arm/display/komeda/komeda_kms.c
index d49772de93e0..03dcf1d7688f 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c
@@ -23,6 +23,15 @@
=20
 DEFINE_DRM_GEM_CMA_FOPS(komeda_cma_fops);
=20
+static void komeda_kms_release(struct drm_device *dev)
+{
+	drm_dev_fini(dev);
+	/*
+	 * No need to kfree(dev) since we're stored in an aggregate struct
+	 * that's managed separately.
+	 */
+}
+
 static int komeda_gem_cma_dumb_create(struct drm_file *file,
 				      struct drm_device *dev,
 				      struct drm_mode_create_dumb *args)
@@ -60,6 +69,7 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *=
data)
 static struct drm_driver komeda_kms_driver =3D {
 	.driver_features =3D DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
 	.lastclose			=3D drm_fb_helper_lastclose,
+	.release			=3D komeda_kms_release,
 	.gem_free_object_unlocked	=3D drm_gem_cma_free_object,
 	.gem_vm_ops			=3D &drm_gem_cma_vm_ops,
 	.dumb_create			=3D komeda_gem_cma_dumb_create,
@@ -257,19 +267,15 @@ static void komeda_kms_mode_config_init(struct komeda=
_kms_dev *kms,
 	config->helper_private =3D &komeda_mode_config_helpers;
 }
=20
-struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev)
+int komeda_kms_init(struct komeda_kms_dev *kms, struct komeda_dev *mdev)
 {
-	struct komeda_kms_dev *kms =3D kzalloc(sizeof(*kms), GFP_KERNEL);
 	struct drm_device *drm;
 	int err;
=20
-	if (!kms)
-		return ERR_PTR(-ENOMEM);
-
 	drm =3D &kms->base;
 	err =3D drm_dev_init(drm, &komeda_kms_driver, mdev->dev);
 	if (err)
-		goto free_kms;
+		return err;
=20
 	drm->dev_private =3D mdev;
=20
@@ -319,7 +325,7 @@ struct komeda_kms_dev *komeda_kms_attach(struct komeda_=
dev *mdev)
 	if (err)
 		goto free_interrupts;
=20
-	return kms;
+	return 0;
=20
 free_interrupts:
 	drm_kms_helper_poll_fini(drm);
@@ -332,12 +338,10 @@ struct komeda_kms_dev *komeda_kms_attach(struct komed=
a_dev *mdev)
 	komeda_kms_cleanup_private_objs(kms);
 	drm->dev_private =3D NULL;
 	drm_dev_put(drm);
-free_kms:
-	kfree(kms);
-	return ERR_PTR(err);
+	return err;
 }
=20
-void komeda_kms_detach(struct komeda_kms_dev *kms)
+void komeda_kms_fini(struct komeda_kms_dev *kms)
 {
 	struct drm_device *drm =3D &kms->base;
 	struct komeda_dev *mdev =3D drm->dev_private;
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h b/drivers/gpu/=
drm/arm/display/komeda/komeda_kms.h
index 45c498e15e7a..e81ceb298034 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.h
@@ -181,7 +181,7 @@ void komeda_kms_cleanup_private_objs(struct komeda_kms_=
dev *kms);
 void komeda_crtc_handle_event(struct komeda_crtc   *kcrtc,
 			      struct komeda_events *evts);
=20
-struct komeda_kms_dev *komeda_kms_attach(struct komeda_dev *mdev);
-void komeda_kms_detach(struct komeda_kms_dev *kms);
+int komeda_kms_init(struct komeda_kms_dev *kms, struct komeda_dev *mdev);
+void komeda_kms_fini(struct komeda_kms_dev *kms);
=20
 #endif /*_KOMEDA_KMS_H_*/
--=20
2.23.0