From patchwork Wed Dec 5 03:41:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Qian Wang X-Patchwork-Id: 10713283 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF5421731 for ; Wed, 5 Dec 2018 08:48:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D04922A07C for ; Wed, 5 Dec 2018 08:48:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C49F62A94B; Wed, 5 Dec 2018 08:48:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C3B792A07C for ; Wed, 5 Dec 2018 08:48:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C63376E38B; Wed, 5 Dec 2018 08:48:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0600.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::600]) by gabe.freedesktop.org (Postfix) with ESMTPS id 57EDA6E34B for ; Wed, 5 Dec 2018 03:41:40 +0000 (UTC) Received: from AM3PR08MB0611.eurprd08.prod.outlook.com (10.163.188.149) by AM3PR08MB0675.eurprd08.prod.outlook.com (10.163.189.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1404.19; Wed, 5 Dec 2018 03:41:35 +0000 Received: from AM3PR08MB0611.eurprd08.prod.outlook.com ([fe80::38d5:d5ee:b90c:901c]) by AM3PR08MB0611.eurprd08.prod.outlook.com ([fe80::38d5:d5ee:b90c:901c%4]) with mapi id 15.20.1382.023; Wed, 5 Dec 2018 03:41:35 +0000 From: "james qian wang (Arm Technology China)" To: Liviu Dudau Subject: [PATCH v1] drm/arm: Delete redundant CONFIG_DRM_ARM Thread-Topic: [PATCH v1] drm/arm: Delete redundant CONFIG_DRM_ARM Thread-Index: AQHUjExrupzxTQVxfESmoukk40rkGA== Date: Wed, 5 Dec 2018 03:41:35 +0000 Message-ID: <20181205034011.29103-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: SY3PR01CA0145.ausprd01.prod.outlook.com (2603:10c6:0:1b::30) To AM3PR08MB0611.eurprd08.prod.outlook.com (2a01:111:e400:c408::21) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM3PR08MB0675; 6:pZ4lmay5lB+eIEbuQA2sVJ7M5sA5sWCbwXkO5/7gWcRTi1UGusBQEUqq/uKaMvEPDymGIaJQGxATZikZX3dSTYYZzbC5WyzQMg5fwJkaF9nVS4JGpYElJqxr3dmJePMG77HpKoPHD8d4ClyCvFMT15CxPn6X5J2tmP7dbS7BaAijiVfOutDJ1i4YBQomHxKEd4hKm6Eje9IqZmly8YeaRpJovCFOWUCbxXxdI/7fCPdhO0+uoRguuW4UfVhiX48+YODldmR7S5brv5RBkHQ8obMaanJ79K3aJyboNy2s+s+meJ+xQdmQqzhZ16SCTV4BzDK9h5KAxByEjwMbYnH5WpG+nhIL4FSL0sISvDoaAzQEV81mzWEJQFeaGqVt48MG/zq3A83vChxM9Q2zBduRU6nV1d4Lb5+cY9HjrDlDImhHy0QewKNDrN6vR16fDeVD4choAu0yCKMJXmHw8QaSqA==; 5:kX86aSefYSszslnqeGQn45u3FhFwxk0pxH8J4vJl31Lip3bsp79zpfv4RfDm8tfb9yExtNN0bvS5Wg4ROu3DkpaOPXtvqQgnKvy18M9qQH2UDGTtpxiXhtgxb6YcCcNfWcVvYrTiELGvt9qWcH2REiiMEtHus6KhyfMxd5kIydc=; 7:27K9notrYTVOQQbULl+t7yfL6VxfAOScgmQJDTkED5Qjk+ELC1t6zo2rwUgEVfhQbnFu5ixse8WiOu9RqMIF2iL/xOxZKG+lxAVGsaVIcFM3coUpr0xVQuGmshJjnt9JIRChge+xx16CXZKStSFD2A== x-ms-office365-filtering-correlation-id: 23c7c16d-2dd1-45f5-0155-08d65a638e07 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM3PR08MB0675; x-ms-traffictypediagnostic: AM3PR08MB0675: nodisclaimer: True x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231455)(999002)(944501520)(52105112)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:AM3PR08MB0675; BCL:0; PCL:0; RULEID:; SRVR:AM3PR08MB0675; x-forefront-prvs: 08770259B4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(366004)(396003)(39860400002)(346002)(136003)(199004)(189003)(316002)(54906003)(37006003)(53936002)(81166006)(81156014)(6862004)(8676002)(4326008)(8936002)(6512007)(2616005)(486006)(476003)(6436002)(386003)(6506007)(6636002)(105586002)(2906002)(106356001)(68736007)(26005)(55236004)(102836004)(66066001)(99286004)(25786009)(6486002)(52116002)(478600001)(103116003)(36756003)(1076002)(186003)(3846002)(6116002)(305945005)(7736002)(86362001)(256004)(14444005)(71200400001)(71190400001)(5660300001)(14454004)(97736004)(575784001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR08MB0675; H:AM3PR08MB0611.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-microsoft-antispam-message-info: VLwVHtjtCPh5pwPdJRLntOeZhQckjcKrgJ7W6pFQi7GmQNmNekezuhd2vtqa+x+eQbxMO+uHToJz28E41UPGeVNrR8TlZx9OWzRlmPUbLWoE6nkshhBmd8zHiChakl7jh/z2wC8T8otRKWX14u9EfRCdK4TEFUnuenX+4c0SE1QZI+Lz7Vt+EHkvJBrtWkW02yZWfYHsOYOisTd8e9T1JyXfHMrm43wESFTcqTGMSKIO6et5b2Y4zPNQEILAwFvGdbr2Qx09ohsX47j1FtY5Tc8lA1uei0CURJ0ee1l29W3IzkxsApDNCRrWAcGo+7z4lSVa5ls+1S6XX9q0n+eVGEGQlWvQ7rWkUEjoaMX6+EA= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23c7c16d-2dd1-45f5-0155-08d65a638e07 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2018 03:41:35.4883 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0675 X-Mailman-Approved-At: Wed, 05 Dec 2018 08:48:28 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "airlied@linux.ie" , nd , "Tiannan Zhu \(Arm Technology China\)" , "maxime.ripard@bootlin.com" , Liviu Dudau , "Jonathan Chai \(Arm Technology China\)" , Alexandru-Cosmin Gheorghe , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "Julien Yin \(Arm Technology China\)" , Ayan Halder , "james qian wang \(Arm Technology China\)" , "malidp@foss.arm.com" , "thomas Sun \(Arm Technology China\)" , "Lowry Li \(Arm Technology China\)" , "sean@poorly.run" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Delete redundant CONFIG_DRM_ARM, and add a menu "ARM devices" to subclass ARM device drivers. Signed-off-by: James (Qian) Wang Reviewed-by: Alexandru Gheorghe --- drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/arm/Kconfig | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 1fafc2f8e8f9..0df0a5a4cc82 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -51,7 +51,7 @@ obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/ obj-$(CONFIG_DRM) += drm.o obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o -obj-$(CONFIG_DRM_ARM) += arm/ +obj-y += arm/ obj-$(CONFIG_DRM_TTM) += ttm/ obj-$(CONFIG_DRM_SCHED) += scheduler/ obj-$(CONFIG_DRM_TDFX) += tdfx/ diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig index 9a18e1bd57b4..f9f7761cb2f4 100644 --- a/drivers/gpu/drm/arm/Kconfig +++ b/drivers/gpu/drm/arm/Kconfig @@ -1,13 +1,10 @@ -config DRM_ARM - bool - help - Choose this option to select drivers for ARM's devices +# SPDX-License-Identifier: GPL-2.0 +menu "ARM devices" config DRM_HDLCD tristate "ARM HDLCD" depends on DRM && OF && (ARM || ARM64) depends on COMMON_CLK - select DRM_ARM select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER help @@ -29,7 +26,6 @@ config DRM_MALI_DISPLAY tristate "ARM Mali Display Processor" depends on DRM && OF && (ARM || ARM64) depends on COMMON_CLK - select DRM_ARM select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER select DRM_GEM_CMA_HELPER @@ -40,3 +36,5 @@ config DRM_MALI_DISPLAY of the hardware. If compiled as a module it will be called mali-dp. + +endmenu