Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp831265imu; Fri, 21 Dec 2018 08:05:22 -0800 (PST) X-Google-Smtp-Source: AFSGD/U4swcadQZGtPQw5waBuib8tjXpFFAPiaFw3ohbNd2EjmwvRxvILayVB4HubLBmN1kJHTKU X-Received: by 2002:a62:cd44:: with SMTP id o65mr3100845pfg.222.1545408322047; Fri, 21 Dec 2018 08:05:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545408322; cv=none; d=google.com; s=arc-20160816; b=JykTi8k+nehInCWcAeNHpxklRY8rP7+vF0HSGisUDoCrhtMWFntqtR9Z0cLUp9rDjS Joh9KlW46LsLUf0o+qamgoxDFk+TFrv3CwNyDpJeSPPpVWDHJBM/sbr2M90YYeutXIt3 04GFInbkuXyfksAg7NzL7Tf8/cG65xjQS+I+qjWV1oU5PmOO6wFlB13Ed22IyPs3gear AhBvWhyaY1SRq9XJFc1tgVeiNN23VjQPBC3iaKuowRpKI0oSGdmETi5WQd7nnP2vz7d6 davBOsT59njw6p+CyW5T/LaFUPrSGk8p4WyXWlq99AZ1GCinaTP4nKc76Hf854VveHHd /1ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:nodisclaimer :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:from:dkim-signature; bh=GDL6c8ViKEwc9vENOdCLTuRyabILdLLGr0zSuLZlWqY=; b=LoYA3FNbg/wf9ZgSmlJCUxoWuWcpTRvqHDTxJBwjtA7h/YTLUESjMvs8rBMHyQ2rsl mhyOXP0dD+5i4XZMvvX7DczNtDHaCsTwULI5ecbloB36hhar614h7ZJ5HhjfFH6eTFGL Q9fiSjDrT4FMcz5wXtvITbu/+yXR1Pen1ldQVPuiDARXYPGo4UWiVWP8fLIlB+A1c9/D FjMv9qjxVvBPkqBcgq9C2IH2zB0BI2rQea2aPeHcTlRIDwZhQEkdbWlw6E9aEGo1oiKv BE7D/EZyQuWLh2z/RdyCVitO0BTVrVYQbVguzDKPTUN8u+akkQ7d+s1WcTZlzUgdHgi/ +Qvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector1-arm-com header.b=ZOOF89en; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m7si20998248pgi.547.2018.12.21.08.05.06; Fri, 21 Dec 2018 08:05:22 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector1-arm-com header.b=ZOOF89en; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389149AbeLUJ7z (ORCPT + 99 others); Fri, 21 Dec 2018 04:59:55 -0500 Received: from mail-eopbgr60069.outbound.protection.outlook.com ([40.107.6.69]:22326 "EHLO EUR04-DB3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730794AbeLUJ7w (ORCPT ); Fri, 21 Dec 2018 04:59:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GDL6c8ViKEwc9vENOdCLTuRyabILdLLGr0zSuLZlWqY=; b=ZOOF89ens68fli/qH4jnpEtiNNY9zhqsMOhIhijOggsHh8Ift4ErSQ3m97ZBeyN9a3GOO9W/R8wb5iEeN4oeRMsxY7hEz/0pOSiWqp3WvE8IyCibCZz3mYI17IDPIPEZxPtPd2GR7osksNr5AM24Q8dL2Pu51aq7RymDWJ00sjQ= Received: from AM0PR08MB4483.eurprd08.prod.outlook.com (20.179.35.149) by AM0PR08MB3187.eurprd08.prod.outlook.com (52.134.93.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1446.19; Fri, 21 Dec 2018 09:59:28 +0000 Received: from AM0PR08MB4483.eurprd08.prod.outlook.com ([fe80::1dff:434f:5905:45db]) by AM0PR08MB4483.eurprd08.prod.outlook.com ([fe80::1dff:434f:5905:45db%5]) with mapi id 15.20.1446.020; Fri, 21 Dec 2018 09:59:28 +0000 From: "james qian wang (Arm Technology China)" To: Liviu Dudau CC: "Jonathan Chai (Arm Technology China)" , Brian Starkey , "Julien Yin (Arm Technology China)" , "thomas Sun (Arm Technology China)" , Alexandru-Cosmin Gheorghe , "Lowry Li (Arm Technology China)" , Ayan Halder , "Tiannan Zhu (Arm Technology China)" , "Jin Gao (Arm Technology China)" , "Yiqi Kang (Arm Technology China)" , nd , "malidp@foss.arm.com" , "maarten.lankhorst@linux.intel.com" , "maxime.ripard@bootlin.com" , "sean@poorly.run" , "corbet@lwn.net" , "linux-doc@vger.kernel.org" , "rdunlap@infradead.org" , "mchehab+samsung@kernel.org" , "davem@davemloft.net" , "gregkh@linuxfoundation.org" , "akpm@linux-foundation.org" , "nicolas.ferre@microchip.com" , "arnd@arndb.de" , "robh+dt@kernel.org" , Mark Rutland , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "airlied@linux.ie" , "yamada.masahiro@socionext.com" , "james qian wang (Arm Technology China)" Subject: [PATCH v3 3/9] drm/komeda: Build komeda to be a platform module Thread-Topic: [PATCH v3 3/9] drm/komeda: Build komeda to be a platform module Thread-Index: AQHUmRPc4AylaC/fOEuiq67HHBm8+Q== Date: Fri, 21 Dec 2018 09:59:28 +0000 Message-ID: <20181221095757.15510-4-james.qian.wang@arm.com> References: <20181221095757.15510-1-james.qian.wang@arm.com> In-Reply-To: <20181221095757.15510-1-james.qian.wang@arm.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [113.29.88.7] x-clientproxiedby: SY3PR01CA0099.ausprd01.prod.outlook.com (2603:10c6:0:19::32) To AM0PR08MB4483.eurprd08.prod.outlook.com (2603:10a6:208:145::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=james.qian.wang@arm.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;AM0PR08MB3187;6:sgRS2G2WrIfn7t6UgFGhVssGrrwNbRePAdF25VrurbKCgQtGHy6YReP8xMCXrZj8bz95jsuERzeJDlAY23RLNtjuixGbIfunAhqm8i+g5BJljElijITnv1crW0IgKc9VoNHsCD8qKnqoeNr0SAUJZ+K0QFKrYulL0eGzwbJbgjBLYqlnvJN9bpFALl9gpP6pU5T2BCuAe8QnaYSLeWk3N7ogsthbEwteyWIlgtqXb8903BQYQf/nNttxLrUBW/xiEpQq4GCfaD7mKLqWcfZLwk4ZQtOMjjPl5uupc41oJzA/e/IPrshcW0B8bYsxV+2VZgqMSv1IacyuJeI/CSjP0301itWfY7+3yjHptRI/Eu0tuFhTJt2UevB98y7ceNSIPR3Vn3W3VRN0w4bMxAzkrbWVxpLZw2uZT1les54hI/iy65FTUln9J2MN70ATIri4Id6ujGgKDJTe9ySwc60ikw==;5:BE9ywXGVruSS44fZCkaa2TRGoQCKNtkJTgX2uw2iawobu1AeupKSDr5LAaJ743umbeqo+cPVDq1Rva1uMPywyp8Mf6krP7F5b7A8sVgZWfeo2vwcnZo5ZBOddA/yDnH8Y621nPK8IcTEbYswZ7h6ckAtJi8QL2lTvT7+Z1UrY0k=;7:s/0vdGZCPIDO6/TJtd4Lguk1IQO7tU0Q9HGZtjFRPQnfTke+sWsrSEWM19MD2lA3OhIko+YzMQukd3H1lWDtyMr3jBXAGCK/ngdRovwr35XPj0ax+BGrk+1ucZWSiR7vMyZE6LFkghc/PedXfPvZtQ== x-ms-office365-filtering-correlation-id: bae27fd7-91fe-485a-cdce-08d6672afef7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM0PR08MB3187; x-ms-traffictypediagnostic: AM0PR08MB3187: nodisclaimer: True x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(3230021)(999002)(5005026)(6040522)(2401047)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231475)(944501520)(52105112)(6055026)(149066)(150057)(6041310)(20161123558120)(20161123564045)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:AM0PR08MB3187;BCL:0;PCL:0;RULEID:;SRVR:AM0PR08MB3187; x-forefront-prvs: 0893636978 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(396003)(39860400002)(376002)(136003)(366004)(189003)(199004)(71200400001)(97736004)(575784001)(71190400001)(103116003)(86362001)(14454004)(2906002)(5660300001)(106356001)(6116002)(105586002)(66066001)(54906003)(6636002)(3846002)(37006003)(99286004)(68736007)(478600001)(25786009)(6486002)(7736002)(36756003)(6436002)(76176011)(316002)(186003)(386003)(6506007)(55236004)(1076003)(26005)(6512007)(256004)(14444005)(6862004)(52116002)(81156014)(476003)(486006)(81166006)(7416002)(102836004)(8676002)(305945005)(2616005)(8936002)(53936002)(4326008)(446003)(11346002)(21314003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR08MB3187;H:AM0PR08MB4483.eurprd08.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: xJ/PYdvs9Epu9PHpKZMeMraCUSH5jOVVBzxvW6V+qrvWnz0hJuFnbeF87VTLq6btKn3itYmhcSuBK4f+glto2V77RxDRC+NCoSyCSO5aJsrO92kpjhhg55lcc0HPh9Mn22mTMewNeXFO5LHuWkb/WTCPP4OIttCutvzDlxWGq1n5g+ft2pKZjnRF7Ir9ziuZfDwj0+yt28CdAnbvLxg0G+s74gH4RZLyfoKQjn3+aa/4Qa60KJwoGNIHYa2AX+FdGz7+gFrzOe6liaiuerOEM6UntmMX4MLdzDVa76cV/a1Pd6M57DPrnf8TYvY+8O9F spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: bae27fd7-91fe-485a-cdce-08d6672afef7 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Dec 2018 09:59:28.6948 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3187 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement a simple wrapper for platform module to build komeda to module, Also add a very simple D71 layer code to show how to discover a product. Komeda driver direct bind the product ENTRY function xxx_identity to DT compatible name like: d71_product =3D { .product_id =3D MALIDP_D71_PRODUCT_ID, .identify =3D d71_identify, }, const struct of_device_id komeda_of_match[] =3D { { .compatible =3D "arm,mali-d71", .data =3D &d71_product, }, {}, }; Then when linux found a matched DT node and call driver to probe, we can easily get the of data, and call into the product to do the identify: komeda_bind() { ... product =3D of_device_get_match_data(dev); product->identify(); ... } Changes in v3: - Fixed style problem found by checkpatch.pl --strict. Signed-off-by: James (Qian) Wang --- .../gpu/drm/arm/display/include/malidp_io.h | 42 ++++++ drivers/gpu/drm/arm/display/komeda/Makefile | 6 +- .../gpu/drm/arm/display/komeda/d71/d71_dev.c | 33 +++++ .../gpu/drm/arm/display/komeda/komeda_dev.h | 3 + .../gpu/drm/arm/display/komeda/komeda_drv.c | 132 ++++++++++++++++++ 5 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/arm/display/include/malidp_io.h create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_drv.c diff --git a/drivers/gpu/drm/arm/display/include/malidp_io.h b/drivers/gpu/= drm/arm/display/include/malidp_io.h new file mode 100644 index 000000000000..4fb3caf864ce --- /dev/null +++ b/drivers/gpu/drm/arm/display/include/malidp_io.h @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * (C) COPYRIGHT 2018 ARM Limited. All rights reserved. + * Author: James.Qian.Wang + * + */ +#ifndef _MALIDP_IO_H_ +#define _MALIDP_IO_H_ + +#include + +static inline u32 +malidp_read32(u32 __iomem *base, u32 offset) +{ + return readl((base + (offset >> 2))); +} + +static inline void +malidp_write32(u32 __iomem *base, u32 offset, u32 v) +{ + writel(v, (base + (offset >> 2))); +} + +static inline void +malidp_write32_mask(u32 __iomem *base, u32 offset, u32 m, u32 v) +{ + u32 tmp =3D malidp_read32(base, offset); + + tmp &=3D (~m); + malidp_write32(base, offset, v | tmp); +} + +static inline void +malidp_write_group(u32 __iomem *base, u32 offset, int num, const u32 *valu= es) +{ + int i; + + for (i =3D 0; i < num; i++) + malidp_write32(base, offset + i * 4, values[i]); +} + +#endif /*_MALIDP_IO_H_*/ diff --git a/drivers/gpu/drm/arm/display/komeda/Makefile b/drivers/gpu/drm/= arm/display/komeda/Makefile index 5b44e36509b1..c03d6876ef75 100644 --- a/drivers/gpu/drm/arm/display/komeda/Makefile +++ b/drivers/gpu/drm/arm/display/komeda/Makefile @@ -5,7 +5,11 @@ ccflags-y :=3D \ -I$(src) =20 komeda-y :=3D \ + komeda_drv.o \ komeda_dev.o \ - komeda_pipeline.o \ + komeda_pipeline.o + +komeda-y +=3D \ + d71/d71_dev.o =20 obj-$(CONFIG_DRM_KOMEDA) +=3D komeda.o diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c b/drivers/gpu= /drm/arm/display/komeda/d71/d71_dev.c new file mode 100644 index 000000000000..af3dabb499cd --- /dev/null +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * (C) COPYRIGHT 2018 ARM Limited. All rights reserved. + * Author: James.Qian.Wang + * + */ +#include "malidp_io.h" +#include "komeda_dev.h" + +static int d71_enum_resources(struct komeda_dev *mdev) +{ + /* TODO add enum resources */ + return -1; +} + +static struct komeda_dev_funcs d71_chip_funcs =3D { + .enum_resources =3D d71_enum_resources, + .cleanup =3D NULL, +}; + +#define GLB_ARCH_ID 0x000 +#define GLB_CORE_ID 0x004 +#define GLB_CORE_INFO 0x008 + +struct komeda_dev_funcs * +d71_identify(u32 __iomem *reg_base, struct komeda_chip_info *chip) +{ + chip->arch_id =3D malidp_read32(reg_base, GLB_ARCH_ID); + chip->core_id =3D malidp_read32(reg_base, GLB_CORE_ID); + chip->core_info =3D malidp_read32(reg_base, GLB_CORE_INFO); + + return &d71_chip_funcs; +} diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/= drm/arm/display/komeda/komeda_dev.h index ad8fa160eff9..680e3e2cf100 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h @@ -92,6 +92,9 @@ komeda_product_match(struct komeda_dev *mdev, u32 target) return MALIDP_CORE_ID_PRODUCT_ID(mdev->chip.core_id) =3D=3D target; } =20 +struct komeda_dev_funcs * +d71_identify(u32 __iomem *reg, struct komeda_chip_info *chip); + struct komeda_dev *komeda_dev_create(struct device *dev); void komeda_dev_destroy(struct komeda_dev *mdev); =20 diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_drv.c b/drivers/gpu/= drm/arm/display/komeda/komeda_drv.c new file mode 100644 index 000000000000..a2657b3d09d7 --- /dev/null +++ b/drivers/gpu/drm/arm/display/komeda/komeda_drv.c @@ -0,0 +1,132 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * (C) COPYRIGHT 2018 ARM Limited. All rights reserved. + * Author: James.Qian.Wang + * + */ +#include +#include +#include +#include +#include +#include "komeda_dev.h" + +struct komeda_drv { + struct komeda_dev *mdev; +}; + +static void komeda_unbind(struct device *dev) +{ + struct komeda_drv *mdrv =3D dev_get_drvdata(dev); + + dev_set_drvdata(dev, NULL); + + if (!mdrv) + return; + + komeda_dev_destroy(mdrv->mdev); + kfree(mdrv); +} + +static int komeda_bind(struct device *dev) +{ + struct komeda_drv *mdrv; + int err; + + mdrv =3D kzalloc(sizeof(*mdrv), GFP_KERNEL); + if (!mdrv) + return -ENOMEM; + + mdrv->mdev =3D komeda_dev_create(dev); + if (IS_ERR(mdrv->mdev)) { + err =3D PTR_ERR(mdrv->mdev); + goto free_mdrv; + } + + dev_set_drvdata(dev, mdrv); + + return 0; + +free_mdrv: + kfree(mdrv); + return err; +} + +static const struct component_master_ops komeda_master_ops =3D { + .bind =3D komeda_bind, + .unbind =3D komeda_unbind, +}; + +static int compare_of(struct device *dev, void *data) +{ + return dev->of_node =3D=3D data; +} + +static void komeda_add_slave(struct device *master, + struct component_match **match, + struct device_node *np, int port) +{ + struct device_node *remote; + + remote =3D of_graph_get_remote_node(np, port, 0); + if (!remote) { + drm_of_component_match_add(master, match, compare_of, remote); + of_node_put(remote); + } +} + +static int komeda_platform_probe(struct platform_device *pdev) +{ + struct device *dev =3D &pdev->dev; + struct component_match *match =3D NULL; + struct device_node *child; + + if (!dev->of_node) + return -ENODEV; + + for_each_available_child_of_node(dev->of_node, child) { + if (of_node_cmp(child->name, "pipeline") !=3D 0) + continue; + + /* add connector */ + komeda_add_slave(dev, &match, child, KOMEDA_OF_PORT_OUTPUT); + } + + return component_master_add_with_match(dev, &komeda_master_ops, match); +} + +static int komeda_platform_remove(struct platform_device *pdev) +{ + component_master_del(&pdev->dev, &komeda_master_ops); + return 0; +} + +static const struct komeda_product_data komeda_products[] =3D { + [MALI_D71] =3D { + .product_id =3D MALIDP_D71_PRODUCT_ID, + .identify =3D d71_identify, + }, +}; + +const struct of_device_id komeda_of_match[] =3D { + { .compatible =3D "arm,mali-d71", .data =3D &komeda_products[MALI_D71], }= , + {}, +}; + +MODULE_DEVICE_TABLE(of, komeda_of_match); + +static struct platform_driver komeda_platform_driver =3D { + .probe =3D komeda_platform_probe, + .remove =3D komeda_platform_remove, + .driver =3D { + .name =3D "komeda", + .of_match_table =3D komeda_of_match, + .pm =3D NULL, + }, +}; + +module_platform_driver(komeda_platform_driver); + +MODULE_AUTHOR("James.Qian.Wang "); +MODULE_DESCRIPTION("Komeda KMS driver"); +MODULE_LICENSE("GPL v2"); --=20 2.17.1