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 6D2FAC4332F for ; Thu, 20 Oct 2022 17:57:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229936AbiJTR5O (ORCPT ); Thu, 20 Oct 2022 13:57:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229632AbiJTR5N (ORCPT ); Thu, 20 Oct 2022 13:57:13 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31E58199F42 for ; Thu, 20 Oct 2022 10:57:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666288632; x=1697824632; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8YfEEm+GMUs76QMVN1GO8XUlQ3blycuQYlNJnbxkN2o=; b=dFU45f7s/86FtD7OktfEgGgDbhTCJTH1UJD3VccXc3KbaaZ8sOmtHVnx EI837G7huY5qhRabTPMS/X3jdCiMmVl2Y5fc0ys+BaGvi+i7Gphjzdmmz 0OBwuREjg956mpRLHWasiCwO2wrbESc5UiApVdfrUsP6Dj5N+mTLaFvSg g43ZHdj4BLYsn39XnCV26dMfZO4xxU3MBM/oee1fzfAaSFqPSLwP3Ik8l b4gsCTT3ViOUWy30TuxfJEGPp+qWB5Fqel7DRcqKmrgbNJMHDlm2As/pB sMVrOANONOTZMBgAKI1BBfRDsql3Ec6k166fnXvuooAR63Wy3nwQOiaZB Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10506"; a="286510809" X-IronPort-AV: E=Sophos;i="5.95,199,1661842800"; d="scan'208";a="286510809" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2022 10:57:11 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10506"; a="772516806" X-IronPort-AV: E=Sophos;i="5.95,199,1661842800"; d="scan'208";a="772516806" Received: from gna-nuc-dev34.igk.intel.com ([10.102.80.34]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2022 10:57:07 -0700 From: Maciej Kwapulinski To: Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Greg Kroah-Hartman , Arnd Bergmann , Jonathan Corbet , Derek Kiernan , Dragan Cvetic , Andy Shevchenko , Linus Walleij , Olof Johansson Cc: dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, Maciej Kwapulinski , Mikolaj Grzybowski Subject: [PATCH v5 02/10] gna: add GNA DRM device Date: Thu, 20 Oct 2022 19:53:26 +0200 Message-Id: <20221020175334.1820519-3-maciej.kwapulinski@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221020175334.1820519-1-maciej.kwapulinski@linux.intel.com> References: <20221020175334.1820519-1-maciej.kwapulinski@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Signed-off-by: Maciej Kwapulinski Tested-by: Mikolaj Grzybowski --- drivers/gpu/drm/gna/Kconfig | 1 + drivers/gpu/drm/gna/gna_device.c | 65 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/gna/gna_device.h | 21 +++++++++++ drivers/gpu/drm/gna/gna_hw.h | 17 +++++++++ drivers/gpu/drm/gna/gna_pci.c | 11 ++++++ 5 files changed, 115 insertions(+) create mode 100644 drivers/gpu/drm/gna/gna_hw.h diff --git a/drivers/gpu/drm/gna/Kconfig b/drivers/gpu/drm/gna/Kconfig index 467f518db7fa..820dc8424045 100644 --- a/drivers/gpu/drm/gna/Kconfig +++ b/drivers/gpu/drm/gna/Kconfig @@ -5,6 +5,7 @@ config DRM_GNA tristate "Intel(R) Gaussian & Neural Accelerator (Intel(R) GNA)" depends on X86 && PCI + depends on DRM help This option enables the Intel(R) Gaussian & Neural Accelerator (Intel(R) GNA) driver: gna diff --git a/drivers/gpu/drm/gna/gna_device.c b/drivers/gpu/drm/gna/gna_device.c index 960b4341c18e..b8620b7da205 100644 --- a/drivers/gpu/drm/gna/gna_device.c +++ b/drivers/gpu/drm/gna/gna_device.c @@ -1,8 +1,73 @@ // SPDX-License-Identifier: GPL-2.0-only // Copyright(c) 2017-2022 Intel Corporation +#include +#include +#include + +#include +#include #include +#include "gna_device.h" + +static void gna_drm_dev_fini(struct drm_device *dev, void *ptr) +{ + drm_dev_unregister(dev); +} + +static int gna_drm_dev_init(struct drm_device *dev) +{ + int err; + + err = drm_dev_register(dev, 0); + if (err) + return err; + + return drmm_add_action_or_reset(dev, gna_drm_dev_fini, NULL); +} + +static const struct drm_driver gna_drm_driver = { + .driver_features = DRIVER_RENDER, + + .name = DRIVER_NAME, + .desc = DRIVER_DESC, + .date = DRIVER_DATE, + .major = DRIVER_MAJOR, + .minor = DRIVER_MINOR, + .patchlevel = DRIVER_PATCHLEVEL, +}; + +int gna_probe(struct device *parent, struct gna_dev_info *dev_info, void __iomem *iobase) +{ + struct gna_device *gna_priv; + struct drm_device *drm_dev; + int err; + + gna_priv = devm_drm_dev_alloc(parent, &gna_drm_driver, struct gna_device, drm); + if (IS_ERR(gna_priv)) + return PTR_ERR(gna_priv); + + drm_dev = &gna_priv->drm; + gna_priv->iobase = iobase; + gna_priv->info = *dev_info; + + if (!(sizeof(dma_addr_t) > 4) || + dma_set_mask(parent, DMA_BIT_MASK(64))) { + err = dma_set_mask(parent, DMA_BIT_MASK(32)); + if (err) + return err; + } + + dev_set_drvdata(parent, drm_dev); + + err = gna_drm_dev_init(drm_dev); + if (err) + return err; + + return 0; +} + MODULE_AUTHOR("Intel Corporation"); MODULE_DESCRIPTION("Intel(R) Gaussian & Neural Accelerator (Intel(R) GNA) Driver"); MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/gna/gna_device.h b/drivers/gpu/drm/gna/gna_device.h index 4cc92f27765a..d269f7da5c5e 100644 --- a/drivers/gpu/drm/gna/gna_device.h +++ b/drivers/gpu/drm/gna/gna_device.h @@ -4,6 +4,27 @@ #ifndef __GNA_DEVICE_H__ #define __GNA_DEVICE_H__ +#include + +#include "gna_hw.h" + #define DRIVER_NAME "gna" +#define DRIVER_DESC "Intel(R) Gaussian & Neural Accelerator (Intel(R) GNA)" +#define DRIVER_DATE "20211201" + +#define DRIVER_MAJOR 1 +#define DRIVER_MINOR 0 +#define DRIVER_PATCHLEVEL 0 + +struct device; + +struct gna_device { + struct drm_device drm; + + /* device related resources */ + void __iomem *iobase; + struct gna_dev_info info; +}; +int gna_probe(struct device *parent, struct gna_dev_info *dev_info, void __iomem *iobase); #endif /* __GNA_DEVICE_H__ */ diff --git a/drivers/gpu/drm/gna/gna_hw.h b/drivers/gpu/drm/gna/gna_hw.h new file mode 100644 index 000000000000..3ca801096fd1 --- /dev/null +++ b/drivers/gpu/drm/gna/gna_hw.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright(c) 2017-2022 Intel Corporation */ + +#ifndef __GNA_HW_H__ +#define __GNA_HW_H__ + +#include + +struct gna_dev_info { + u32 hwid; + u32 num_pagetables; + u32 num_page_entries; + u32 max_layer_count; + u64 max_hw_mem; +}; + +#endif // __GNA_HW_H__ diff --git a/drivers/gpu/drm/gna/gna_pci.c b/drivers/gpu/drm/gna/gna_pci.c index 6bd00c66f3a7..14f8b34e5f5c 100644 --- a/drivers/gpu/drm/gna/gna_pci.c +++ b/drivers/gpu/drm/gna/gna_pci.c @@ -5,10 +5,13 @@ #include #include "gna_device.h" +#include "gna_hw.h" #include "gna_pci.h" int gna_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pci_id) { + struct gna_dev_info *dev_info; + void __iomem *iobase; int err; err = pcim_enable_device(pcidev); @@ -19,8 +22,16 @@ int gna_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pci_id) if (err) return err; + iobase = pcim_iomap_table(pcidev)[0]; + pci_set_master(pcidev); + dev_info = (struct gna_dev_info *)pci_id->driver_data; + + err = gna_probe(&pcidev->dev, dev_info, iobase); + if (err) + return err; + return 0; } -- 2.25.1