From patchwork Wed Nov 29 22:02:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sui Jingfeng X-Patchwork-Id: 171606 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:296:b0:164:83eb:24d7 with SMTP id ek22csp7413rwb; Wed, 29 Nov 2023 14:03:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHkbt1wSNSWMscWqxkF8M0DF8UMC93+FnWR6iztQghIeQEvPTEAJgoniaA9JS87gAuIaGba X-Received: by 2002:a05:6a00:8016:b0:6cd:cecc:d05d with SMTP id eg22-20020a056a00801600b006cdceccd05dmr4705297pfb.32.1701295420589; Wed, 29 Nov 2023 14:03:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701295420; cv=none; d=google.com; s=arc-20160816; b=wr0Xg1iQQ3Mw7fvGrKxfkqEmc+GQKns13n9a85YbRZEHrwVaHVvYRHaTQE/Ook45l8 uZusmat2qbKHu9WyVcx4QMmBJ49pU4EMKoSX7Ronsu0q3BQJkvTZtt3tr6/gwXlyGvtK NOklqmFjiK9wmmeBOCXnshlwNFTa2Sk/hx1Wj/vTdGDNT5fJZVXltNi9oZ7cYV4cNsWU n1Pr/BoOzLrjc9wgRAKKDCrjzzGQemmDEpJS9rxAZ23MUcFn7aSEuiVjcNXRfaeX64JM brWHKW2uPuq82QPzR+nTjS4JpGJgr9+t1Q5R2wUijItbq3crlrc8/95HIvHPbdeGIIf+ wtMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=h1yRcYeARMB81Dlf07igmU59Jo/Xm98e5uimkNu4pXo=; fh=bkgMuJ+ccmbRTu7CWU7Yhvsah3Yc6VFvCo8aOWXxHWU=; b=Qk39V7jfAyv2suCJifLlFnto13fbw5bSwct/hj1/NiUeLTdHc/LsQj8/2m4XYVHt88 OYSx63y0W+uOCKo31yo5XnZDFOiZwMUTESgflIW0NIVI8Soarfr8+xGT4MLDk+Z5jhcR 38RY/BmyW6t2ioIQa0DWt2kD6RES53BYuOJ9v9TSlzNbcdBoZ1q7BHUna93eamt8OWAi 7kWo9218m6Tq+1+qmXSu0lV3dUxWo+TbFB/j+xdWCFnMxjhfyzzXGSOEk0v9eOxP4+LT jBz3Kl8z0IzxtdQfXTin0aF8ipuJcvMVNHLqvEqroAY+8LqqabdvdNQtJx+4ApMqNKv1 uZyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=hBwk9E2x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id q23-20020a656857000000b005c1b28061b0si15300294pgt.65.2023.11.29.14.03.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 14:03:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=hBwk9E2x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 9405F8032A3A; Wed, 29 Nov 2023 14:03:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234856AbjK2WDE (ORCPT + 99 others); Wed, 29 Nov 2023 17:03:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234787AbjK2WC5 (ORCPT ); Wed, 29 Nov 2023 17:02:57 -0500 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [IPv6:2001:41d0:1004:224b::ac]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18D18B2 for ; Wed, 29 Nov 2023 14:02:56 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1701295374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h1yRcYeARMB81Dlf07igmU59Jo/Xm98e5uimkNu4pXo=; b=hBwk9E2x1mwVZaGFl4sJuvhTDJq502/lFRsqjZBSxrMW4eWsrAPr/YmljLAw6cPLq5KiBs pkDqsvmBF0w614+utgqNrvw0iJuQoTsqxIbwY3DXFmGM2UeR4gL02L9huwdMmEE8eAay3S Rnx/Vd9L64f+8GV5Y45YG9CYdSMqynA= From: Sui Jingfeng To: Lucas Stach Cc: Christian Gmeiner , dri-devel@lists.freedesktop.org, etnaviv@lists.freedesktop.org, linux-kernel@vger.kernel.org, Sui Jingfeng Subject: [etnaviv-next v12 7/8] drm/etnaviv: Add support for the JingJia Macro and LingJiu PCI(e) GPUs Date: Thu, 30 Nov 2023 06:02:30 +0800 Message-Id: <20231129220231.12763-8-sui.jingfeng@linux.dev> In-Reply-To: <20231129220231.12763-1-sui.jingfeng@linux.dev> References: <20231129220231.12763-1-sui.jingfeng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 29 Nov 2023 14:03:28 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783937547066971144 X-GMAIL-MSGID: 1783937547066971144 Tested on X86-64 with JM9100 GPU, the JM9100 discrete GPU has only one vivante GPU found so far. $ sudo dmesg | grep etnaviv etnaviv 0000:0d:00.0: enabling device (0000 -> 0003) etnaviv 0000:0d:00.0: Unbalanced pm_runtime_enable! etnaviv 0000:0d:00.0: model: GC9200, revision: 6304 [drm] Initialized etnaviv 1.3.0 20151214 for 0000:0d:00.0 on minor 0 Signed-off-by: Sui Jingfeng --- drivers/gpu/drm/etnaviv/etnaviv_pci_drv.c | 112 +++++++++++++++++++++- 1 file changed, 109 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_pci_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_pci_drv.c index 37de661844d8..b55ee6dd723e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_pci_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_pci_drv.c @@ -6,10 +6,109 @@ #include "etnaviv_gpu.h" #include "etnaviv_pci_drv.h" +enum etnaviv_pci_gpu_chip_id { + GC_CORE_UNKNOWN = 0, + JM9100 = 1, + JD9230P = 2, + LINGJIU_GP102 = 3, + GC1000_IN_LS7A1000 = 4, + GC1000_IN_LS2K1000 = 5, + GC_CORE_PCI_LAST, +}; + +struct etnaviv_pci_gpu_platform_data { + enum etnaviv_pci_gpu_chip_id chip_id; + u32 num_core; + u32 num_vram; + u32 vram_bars[2]; + u32 mmio_bar; + struct { + u32 id; + u32 offset; + u32 size; + char name[20]; + } cores[ETNA_MAX_PIPES]; + + bool has_dedicated_vram; + bool no_clk; + bool share_irq; + char name[24]; +}; + +static const struct etnaviv_pci_gpu_platform_data +gc_core_plaform_data[GC_CORE_PCI_LAST] = { + { + .chip_id = GC_CORE_UNKNOWN, + }, + { + .chip_id = JM9100, + .num_core = 1, + .num_vram = 2, + .vram_bars = {0, 2}, + .mmio_bar = 1, + .cores = {{0, 0x00900000, 0x00010000, "etnaviv-gpu,3d"},}, + .has_dedicated_vram = true, + .no_clk = true, + .share_irq = true, + .name = "JingJia Micro JM9100", + }, + { + .chip_id = JD9230P, + .num_core = 2, + .num_vram = 2, + .vram_bars = {0, 2}, + .mmio_bar = 1, + .cores = {{0, 0x00900000, 0x00010000, "etnaviv-gpu,3d"}, + {1, 0x00910000, 0x00010000, "etnaviv-gpu,3d"},}, + .has_dedicated_vram = true, + .no_clk = true, + .share_irq = true, + .name = "JingJia Micro JD9230P", + }, + { + .chip_id = LINGJIU_GP102, + .num_core = 2, + .num_vram = 1, + .vram_bars = {0,}, + .mmio_bar = 2, + .cores = {{0, 0x00040000, 0x00010000, "etnaviv-gpu,3d"}, + {0, 0x000C0000, 0x00010000, "etnaviv-gpu,2d"},}, + .has_dedicated_vram = true, + .no_clk = true, + .share_irq = true, + .name = "LingJiu GP102", + }, + { + .chip_id = GC1000_IN_LS7A1000, + .num_core = 1, + .num_vram = 1, + .vram_bars = {2, 0}, + .mmio_bar = 0, + .cores = {{0, 0, 0, "etnaviv-gpu,3d"}, {}, {}, {}}, + .has_dedicated_vram = true, + .no_clk = true, + .share_irq = true, + .name = "GC1000 in LS7A1000", + }, + { + .chip_id = GC1000_IN_LS2K1000, + .num_core = 1, + .num_vram = 0, + .mmio_bar = 0, + .cores = {{0, 0, 0, "etnaviv-gpu,3d"}, {}, {}, {}}, + .has_dedicated_vram = false, + .no_clk = true, + .share_irq = true, + .name = "GC1000 in LS2K1000", + }, +}; + static int etnaviv_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { + enum etnaviv_pci_gpu_chip_id chip_id = ent->driver_data; struct device *dev = &pdev->dev; + const struct etnaviv_pci_gpu_platform_data *pdata; void __iomem *mmio; int ret; @@ -25,11 +124,15 @@ static int etnaviv_pci_probe(struct pci_dev *pdev, if (ret) return ret; + pdata = &gc_core_plaform_data[chip_id]; + /* PCI bar 0 contain the MMIO registers */ - mmio = pcim_iomap(pdev, 0, 0); + mmio = pcim_iomap(pdev, pdata->mmio_bar, 0); if (IS_ERR(mmio)) return PTR_ERR(mmio); + mmio += pdata->cores[0].offset; + ret = etnaviv_gpu_driver_create(dev, mmio, pdev->irq, false, false); if (ret) return ret; @@ -49,8 +152,11 @@ static void etnaviv_pci_remove(struct pci_dev *pdev) } static const struct pci_device_id etnaviv_pci_id_lists[] = { - {PCI_VDEVICE(LOONGSON, 0x7a15)}, - {PCI_VDEVICE(LOONGSON, 0x7a05)}, + {0x0731, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, JM9100}, + {0x0731, 0x9230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, JD9230P}, + {0x0709, 0x0001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, LINGJIU_GP102}, + {PCI_VDEVICE(LOONGSON, 0x7a15), GC1000_IN_LS7A1000}, + {PCI_VDEVICE(LOONGSON, 0x7a05), GC1000_IN_LS2K1000}, { } };