From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A3C8C433E1 for ; Wed, 19 Aug 2020 12:04:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 405FE205CB for ; Wed, 19 Aug 2020 12:04:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597838671; bh=7JhGbZ+Jj8x10CIemJJxWG5JRE7ESkXx61Uycvwm794=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0I5o0u3zvxV4A3ROUjzbTezKP5TwNxGzHvwPe2mPOxnb9fDfH1y/ves/1fSdXv7jx xGwq1I3+mbQIwJdCzkwMOY4O41etKIbp5pK8QXFsd6BE6cfbGK6EkiMIlZQtLJl+Kz lmPofj/GR/e1lyecSQyKkn3ndUpZZf1Qi/WdOBfQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726585AbgHSME3 (ORCPT ); Wed, 19 Aug 2020 08:04:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:47476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728227AbgHSLrq (ORCPT ); Wed, 19 Aug 2020 07:47:46 -0400 Received: from mail.kernel.org (ip5f5ad5a3.dynamic.kabel-deutschland.de [95.90.213.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 14E902310F; Wed, 19 Aug 2020 11:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597837583; bh=7JhGbZ+Jj8x10CIemJJxWG5JRE7ESkXx61Uycvwm794=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xz4ZHfrzmYdeFttfQAIRRSYrD2365ly1qjd6PJc31330zlEm0tGrV1gEsrvboT6fc g7xY3ys36oMxQj+rNK7uVOhU1L06/iZL1pp/UnNiRKyWQiB2ms8jahZFqBMnkW1ERa xf11uR1goaXfCrffokUvSxEStjA4NhKO1aXMHNEs= Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1k8MXt-00Eubm-1a; Wed, 19 Aug 2020 13:46:21 +0200 From: Mauro Carvalho Chehab To: Greg Kroah-Hartman Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , John Stultz , Manivannan Sadhasivam , Daniel Vetter , dri-devel , Liwei Cai , Chen Feng , Xiubin Zhang , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 38/49] staging: hikey9xx/gpu: add kirin9xx driver to the building system Date: Wed, 19 Aug 2020 13:46:06 +0200 Message-Id: <6bb2c71410a8065e2a2c5f13294b27154dbd786b.1597833138.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that everything is in place, add the driver to the building system. Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/hikey9xx/Kconfig | 3 ++ drivers/staging/hikey9xx/Makefile | 1 + drivers/staging/hikey9xx/gpu/Kconfig | 52 ++++++--------------------- drivers/staging/hikey9xx/gpu/Makefile | 21 ++++------- 4 files changed, 22 insertions(+), 55 deletions(-) diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig index 0e97b5b9a56a..b2ce886e1c4e 100644 --- a/drivers/staging/hikey9xx/Kconfig +++ b/drivers/staging/hikey9xx/Kconfig @@ -36,3 +36,6 @@ config REGULATOR_HI6421V600 This driver provides support for the voltage regulators on HiSilicon Hi6421v600 PMU / Codec IC. This is used on Kirin 3670 boards, like HiKey 970. + +# DRM/KMS driver +source "drivers/staging/hikey9xx/gpu/Kconfig" diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile index 9371dcc3d35b..1a848d398ab6 100644 --- a/drivers/staging/hikey9xx/Makefile +++ b/drivers/staging/hikey9xx/Makefile @@ -3,3 +3,4 @@ obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o obj-$(CONFIG_REGULATOR_HI6421V600) += hi6421v600-regulator.o +obj-y += gpu/ diff --git a/drivers/staging/hikey9xx/gpu/Kconfig b/drivers/staging/hikey9xx/gpu/Kconfig index 5533ee624f29..957da13bcf81 100644 --- a/drivers/staging/hikey9xx/gpu/Kconfig +++ b/drivers/staging/hikey9xx/gpu/Kconfig @@ -1,52 +1,22 @@ -config DRM_HISI_KIRIN - tristate "DRM Support for Hisilicon Kirin series SoCs Platform" +config DRM_HISI_KIRIN9XX + tristate "DRM Support for Hisilicon Kirin9xx series SoCs Platform" depends on DRM && OF && ARM64 select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER select DRM_KMS_CMA_HELPER - select HISI_KIRIN_DW_DSI - help - Choose this option if you have a hisilicon Kirin chipsets(hi6220). - If M is selected the module will be called kirin-drm. - -config DRM_KIRIN_960 - tristate "DRM Support for Hisilicon Kirin960 series SoCs Platform" - depends on DRM && OF && ARM64 - select DRM_KMS_HELPER - select DRM_GEM_CMA_HELPER - select DRM_KMS_CMA_HELPER - select HISI_KIRIN_DW_DSI - help - Choose this option if you have a hisilicon Kirin chipsets(kirin960). - If M is selected the module will be called kirin-drm. - -config HISI_KIRIN_DW_DSI - tristate "HiSilicon Kirin specific extensions for Synopsys DW MIPI DSI" - depends on DRM_HISI_KIRIN || DRM_KIRIN_960 select DRM_MIPI_DSI - select DRM_PANEL help - This selects support for HiSilicon Kirin SoC specific extensions for - the Synopsys DesignWare DSI driver. If you want to enable MIPI DSI on - hi6220 based SoC, you should selet this option. + Choose this option if you have a HiSilicon Kirin960 or Kirin970. + If M is selected the module will be called kirin9xx-drm. -config DRM_PANEL_HIKEY960_NTE300NTS - tristate "Hikey960 NTE300NTS video mode panel" - depends on OF - depends on DRM_MIPI_DSI - help - Say Y here if you want to enable LCD panel driver for Hikey960 boadr. - Current support panel: NTE300NTS(1920X1200) - -config HISI_FB_970 - tristate "DRM Support for Hisilicon Kirin970 series SoCs Platform" - depends on DRM && OF && ARM64 +config DRM_HISI_KIRIN970 + bool "Enable support for Hisilicon Kirin970" depends on DRM_MIPI_DSI + depends on DRM_HISI_KIRIN9XX help Choose this option if you have a hisilicon Kirin chipsets(kirin970). - If M is selected the module will be called kirin-drm. -config HDMI_ADV7511_AUDIO - tristate "HDMI Support ADV7511 audio" - help - Choose this option to support HDMI ADV7511 audio. +config DRM_HISI_KIRIN9XX_DSI + tristate + depends on DRM_HISI_KIRIN9XX + default y diff --git a/drivers/staging/hikey9xx/gpu/Makefile b/drivers/staging/hikey9xx/gpu/Makefile index a5e008365a57..9df7894ccb42 100644 --- a/drivers/staging/hikey9xx/gpu/Makefile +++ b/drivers/staging/hikey9xx/gpu/Makefile @@ -1,15 +1,8 @@ -EXTRA_CFLAGS += \ - -Iinclude/drm -kirin-drm-y := kirin_fbdev.o \ - kirin_fb.o \ - kirin_drm_drv.o \ - kirin_drm_dss.o \ - kirin_drm_dpe_utils.o \ - kirin_drm_overlay_utils.o \ - kirin_pwm.o \ - hdmi/adv7535.o \ +# SPDX-License-Identifier: GPL-2.0-only +kirin9xx-drm-y := kirin9xx_drm_drv.o \ + kirin9xx_drm_dss.o \ + kirin9xx_drm_dpe_utils.o \ + kirin9xx_drm_overlay_utils.o - -obj-$(CONFIG_HDMI_ADV7511_AUDIO) += hdmi/adv7535_audio.o -obj-$(CONFIG_DRM_KIRIN_960) += kirin-drm.o -obj-$(CONFIG_HISI_KIRIN_DW_DSI) += dw_drm_dsi.o +obj-$(CONFIG_DRM_HISI_KIRIN9XX) += kirin9xx-drm.o kirin9xx_pwm.o +obj-$(CONFIG_DRM_HISI_KIRIN9XX_DSI) += kirin9xx_dw_drm_dsi.o -- 2.26.2