From patchwork Wed Jun 1 11:02:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12866726 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1018FC433F5 for ; Wed, 1 Jun 2022 11:04:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZDINVGYlxq9ekiyHIFaYDsYuK2SlUpJzrXBILBWYt28=; b=34kDtxh/F4GGtf yH5ZamfzcxdFaC7tGo65o4DGWH8NiquJD3btpMhbTRFmMK0ggFyYYWmS1mWSXQ9TWHfLbxQrNK3S3 mrn8gFq6CbxcAZD3b4iOQulTfslBoIKq47zNgt/pUgJ4+4IgcapnDrwRPmlriccrYpre6/6Iux7bO RnJU9KM9J/daQqyjb23/lkEocK5Bg6aWCIHfF6O/0z4gUJomB9fTBxcNvYKt2DcKBbTzly6ARhZG3 NCO3vILiBOMK+GVwTsAwEmjEy1DeXL85kEliLsuI1z8ST5BGjoR9WarZmo1ZriL5AbAZ2hrh9rDcE 2NeoiCP1RYY//a09RG+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM8P-00FTy1-FP; Wed, 01 Jun 2022 11:03:29 +0000 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM87-00FTmg-8n; Wed, 01 Jun 2022 11:03:12 +0000 Received: by mail-wr1-x42c.google.com with SMTP id s24so1807071wrb.10; Wed, 01 Jun 2022 04:03:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OnvXF5s5GrKznhV9RiSELRMKmTLaCDRSK8iW7WfFUKs=; b=OSFoRwjoVdXIYu1i8ASpaOgYErZK4abslLMXIg14B84wAwFiqo3ENN+jRsPEoJ1Qf/ GLH1IRKGegXk5UyjI56HuSfaL8fRcHqT/tLQR1yQhZuowLnSOkMz+m8eE0ZA5sqDWtb5 72JIkmAjAkMQi6RXRQ4ydVKsHV/drR+t1z08uKcTGSNK9e+Q3LHL7nfR3YS+YX7MnYoU 1XSUr8cX+KOUatphzmZqQXYnoG59hGlt6Sw9mJXR1sCrOBxlJgPHlhiZp47XB0HZw7B2 QW5VwJ5kA4c3fRYWaG4nPYTbuRxCppGSGBluTJcKleeWxLsfIZk4dYvaJDnj43LQsCfA L84Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OnvXF5s5GrKznhV9RiSELRMKmTLaCDRSK8iW7WfFUKs=; b=t3z0C745kx0RXsvYmRSp5V84RaF8wU+Kbb/AdWxLdjzs+0Ht5mUjwv738Fu0Sm+Ovr MHWNDLU/eE+8CE1SQAFlKPkz1KYhyBVSxu0G6d4pSQWKg19XVYoexdWwwAZaF2F96NjW 0ot765fcc5rA54pj5txaUwJhGDTvLD9NUiqOYc+F7E0XVWKxuK/9hf+tdGt4H8LeH5oP arlYjxRV1J8z+3exu4jHv2du8lyV6VFQY3FI+A6yXnf6LNRHTPIknvLIeNMrbgC2yxd8 qVtkNX8poJgsqZSRimFYVxgHISeTBfCsb/uQLy+uvM84Ng7XUTfRVS5h2Zqd4a05wX4h pgtA== X-Gm-Message-State: AOAM533b79YQPpnpADCMFvp6YW/xZpxDvQ3SQUZS0AnJowkmcEUMqVg1 UIHB6MttvZwOYMs59hz6Cys= X-Google-Smtp-Source: ABdhPJymYOkcWRKsxtIvvy63ziXLPzoCyHa9UOjlimZGWPD9nRjpBYX2OWLNLJkY8aFJfPMxiZ4dzQ== X-Received: by 2002:a5d:68c1:0:b0:210:2e3c:5b0d with SMTP id p1-20020a5d68c1000000b002102e3c5b0dmr15031597wrw.694.1654081387634; Wed, 01 Jun 2022 04:03:07 -0700 (PDT) Received: from morpheus.home.roving-it.com (82-132-215-116.dab.02.net. [82.132.215.116]) by smtp.googlemail.com with ESMTPSA id j14-20020a05600c190e00b00397381a7ae8sm6074559wmq.30.2022.06.01.04.03.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 04:03:07 -0700 (PDT) From: Peter Robinson To: Arnd Bergmann , bcm-kernel-feedback-list@broadcom.com, Daniel Vetter , David Airlie , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, Emma Anholt , Florian Fainelli , javierm@redhat.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, maxime@cerno.tech, Nicolas Saenz Julienne , Rob Herring , Stefan Wahren , Catalin Marinas , Will Deacon Cc: Peter Robinson , Nicolas Saenz Julienne Subject: [PATCH v5 1/6] dt-bindings: gpu: v3d: Add BCM2711's compatible Date: Wed, 1 Jun 2022 12:02:44 +0100 Message-Id: <20220601110249.569540-2-pbrobinson@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601110249.569540-1-pbrobinson@gmail.com> References: <20220601110249.569540-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220601_040311_361495_BB990E52 X-CRM114-Status: GOOD ( 10.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org BCM2711, Raspberry Pi 4's SoC, contains a V3D core. So add its specific compatible to the bindings. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson Reviewed-by: Stefan Wahren Acked-by: Rob Herring Reviewed-by: Javier Martinez Canillas --- Changes since v5: - Change compatible to align downstream and othee HW, reorder to suit Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml index e6485f7b046f..217c42874f41 100644 --- a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml +++ b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml @@ -16,6 +16,7 @@ properties: compatible: enum: + - brcm,2711-v3d - brcm,7268-v3d - brcm,7278-v3d From patchwork Wed Jun 1 11:02:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12866728 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89DA3C433F5 for ; Wed, 1 Jun 2022 11:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7vqqxyTv2Ip1jqqOTWy6cmaGGC7CM2aS5ab9aAqWdPI=; b=fwcIvyq5rswoL/ xGEkHWnURTlS8+wVZeyMXAkUzjG/HQ/rx+xSHr9MBDEuaKCnL9AJg//1Mty9Q28gDAkRBMhnk57A7 KCom+8zWTIgBo4mrVLqYCPSBff9XWpHXwi1ml7rdi9gWgGfWzycR8evKGEql1aDBvfNuHZSnm2tEi HxWgJaiCc1PxwTxMbt/YBC3heJnxnZt3c5ckZLiesqcKQPkKX+h/6Zb75nddmn6OGASs2i0CEQ0B3 2PbkHaFrnMGbbzYn6Pl7GpV8ZTye8gSkJ4c7wfnZG0LmoaY5j8SdyMN12n3oq8b4Q3KfrZa9TX6wH WR7a42GfAmDxP2N+xYfQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM8l-00FU4l-Jm; Wed, 01 Jun 2022 11:03:51 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM87-00FTo2-W0; Wed, 01 Jun 2022 11:03:15 +0000 Received: by mail-wr1-x432.google.com with SMTP id k19so1818665wrd.8; Wed, 01 Jun 2022 04:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7T75qdFUJRrTfq8rZsvTxHnq9WmFnzbyWZBt91nUGv4=; b=UvVKUFoGj8BE8wKVShM9g1vZtcUpz9koCKyv27BPpa1d69JAA9GuVGSKgRYb5f4H/P PuFtTujTXybsEsGRBXrSuCjguJ8As29GCRoa31nEZ+AJqDxA9rfdO/eSEwtp7grTd3/d wCMoqhaB4cJohaM7zK3ydnjxjryFPBMhX0KUYbUj9JhduxQ9Hk6+CxvzQdVtRm99XFO+ 7Owow+FtI6e6yOONGf2OCt/HPfwSbcAdNi/KopY6ZXhU5LbKqDNbaek5aeipXUlNY9JM pGbBHO+uUiR1HtzB2OPGCut7WxPZCO86tgxwTLv41Z1H+MKooePLcsOptDS13R/y4Ttm zvKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7T75qdFUJRrTfq8rZsvTxHnq9WmFnzbyWZBt91nUGv4=; b=Cg0NuxaFX2i/VWhICWmMrUmjxPT7GhapRGrQKuq5nmis614eUnb0zIbG+tkVTU5SgC +93EJ8O5DxfeecF8Cp6xI/s5JMUlVyAMBASN6AqPm0XIy14JjVGbKaE4JZORwxpYLI25 gxx0nFQP1vM5FYkMudY2DjBcOQquKgpfXKoZfiwFIk3oh94D093YKSD8Dx9fIckF2NKc qbFaanfZ//m85EjyHvmlOpb3RshSwjsxKqjIzLaCbx3BmVbHJjv7OVNEqMRmXqW0WK/A SWYQd3okphvOL0R0yyGVrKUzwwOLE4DwhCIgJFWndeQAL3y2nWM5BIgPex7JG7UDT2tb IP6Q== X-Gm-Message-State: AOAM532iUGZQsLt86t3QTa1W8XboRrVx3OCamk3yEXHxCWDnSWMVnHI2 k5c7JmL5ygbuiV0LboB0/w8= X-Google-Smtp-Source: ABdhPJyFukaGJRvYWHjSXo1WZgIH6pzJMFXudFnk8AkT0I7/rJ/CCSzlqahWs8S6XeTgf8oqGsOiXg== X-Received: by 2002:a05:6000:1d84:b0:20e:5fae:6e71 with SMTP id bk4-20020a0560001d8400b0020e5fae6e71mr54637270wrb.224.1654081389762; Wed, 01 Jun 2022 04:03:09 -0700 (PDT) Received: from morpheus.home.roving-it.com (82-132-215-116.dab.02.net. [82.132.215.116]) by smtp.googlemail.com with ESMTPSA id j14-20020a05600c190e00b00397381a7ae8sm6074559wmq.30.2022.06.01.04.03.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 04:03:09 -0700 (PDT) From: Peter Robinson To: Arnd Bergmann , bcm-kernel-feedback-list@broadcom.com, Daniel Vetter , David Airlie , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, Emma Anholt , Florian Fainelli , javierm@redhat.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, maxime@cerno.tech, Nicolas Saenz Julienne , Rob Herring , Stefan Wahren , Catalin Marinas , Will Deacon Cc: Peter Robinson , Nicolas Saenz Julienne Subject: [PATCH v5 2/6] drm/v3d: Get rid of pm code Date: Wed, 1 Jun 2022 12:02:45 +0100 Message-Id: <20220601110249.569540-3-pbrobinson@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601110249.569540-1-pbrobinson@gmail.com> References: <20220601110249.569540-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220601_040312_071437_BBF6829A X-CRM114-Status: GOOD ( 19.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Runtime PM doesn't seem to work correctly on this driver. On top of that, commit 8b6864e3e138 ("drm/v3d/v3d_drv: Remove unused static variable 'v3d_v3d_pm_ops'") hints that it most likely never did as the driver's PM ops were not hooked-up. So, in order to support regular operation with V3D on BCM2711 (Raspberry Pi 4), get rid of the PM code. PM will be reinstated once we figure out the underlying issues. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson Reviewed-by: Javier Martinez Canillas --- Changes since v5: - Rebase Changes since v3: - Minor updates for rebase drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +----------------- drivers/gpu/drm/v3d/v3d_drv.c | 11 ----------- drivers/gpu/drm/v3d/v3d_gem.c | 12 +----------- 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c index 29fd13109e43..efbde124c296 100644 --- a/drivers/gpu/drm/v3d/v3d_debugfs.c +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include @@ -131,11 +130,7 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) struct drm_device *dev = node->minor->dev; struct v3d_dev *v3d = to_v3d_dev(dev); u32 ident0, ident1, ident2, ident3, cores; - int ret, core; - - ret = pm_runtime_get_sync(v3d->drm.dev); - if (ret < 0) - return ret; + int core; ident0 = V3D_READ(V3D_HUB_IDENT0); ident1 = V3D_READ(V3D_HUB_IDENT1); @@ -188,9 +183,6 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) (misccfg & V3D_MISCCFG_OVRTMUOUT) != 0); } - pm_runtime_mark_last_busy(v3d->drm.dev); - pm_runtime_put_autosuspend(v3d->drm.dev); - return 0; } @@ -218,11 +210,6 @@ static int v3d_measure_clock(struct seq_file *m, void *unused) uint32_t cycles; int core = 0; int measure_ms = 1000; - int ret; - - ret = pm_runtime_get_sync(v3d->drm.dev); - if (ret < 0) - return ret; if (v3d->ver >= 40) { V3D_CORE_WRITE(core, V3D_V4_PCTR_0_SRC_0_3, @@ -246,9 +233,6 @@ static int v3d_measure_clock(struct seq_file *m, void *unused) cycles / (measure_ms * 1000), (cycles / (measure_ms * 100)) % 10); - pm_runtime_mark_last_busy(v3d->drm.dev); - pm_runtime_put_autosuspend(v3d->drm.dev); - return 0; } diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index 1afcd54fbbd5..56d5f831e48b 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -43,7 +42,6 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, { struct v3d_dev *v3d = to_v3d_dev(dev); struct drm_v3d_get_param *args = data; - int ret; static const u32 reg_map[] = { [DRM_V3D_PARAM_V3D_UIFCFG] = V3D_HUB_UIFCFG, [DRM_V3D_PARAM_V3D_HUB_IDENT1] = V3D_HUB_IDENT1, @@ -69,17 +67,12 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data, if (args->value != 0) return -EINVAL; - ret = pm_runtime_get_sync(v3d->drm.dev); - if (ret < 0) - return ret; if (args->param >= DRM_V3D_PARAM_V3D_CORE0_IDENT0 && args->param <= DRM_V3D_PARAM_V3D_CORE0_IDENT2) { args->value = V3D_CORE_READ(0, offset); } else { args->value = V3D_READ(offset); } - pm_runtime_mark_last_busy(v3d->drm.dev); - pm_runtime_put_autosuspend(v3d->drm.dev); return 0; } @@ -280,10 +273,6 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) return -ENOMEM; } - pm_runtime_use_autosuspend(dev); - pm_runtime_set_autosuspend_delay(dev, 50); - pm_runtime_enable(dev); - ret = v3d_gem_init(drm); if (ret) goto dma_free; diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 92bc0faee84f..7026214a09f0 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -367,9 +366,6 @@ v3d_job_free(struct kref *ref) dma_fence_put(job->irq_fence); dma_fence_put(job->done_fence); - pm_runtime_mark_last_busy(job->v3d->drm.dev); - pm_runtime_put_autosuspend(job->v3d->drm.dev); - if (job->perfmon) v3d_perfmon_put(job->perfmon); @@ -471,14 +467,10 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, job->v3d = v3d; job->free = free; - ret = pm_runtime_get_sync(v3d->drm.dev); - if (ret < 0) - goto fail; - ret = drm_sched_job_init(&job->base, &v3d_priv->sched_entity[queue], v3d_priv); if (ret) - goto fail_job; + goto fail; if (has_multisync) { if (se->in_sync_count && se->wait_stage == queue) { @@ -509,8 +501,6 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv, fail_deps: drm_sched_job_cleanup(&job->base); -fail_job: - pm_runtime_put_autosuspend(v3d->drm.dev); fail: kfree(*container); *container = NULL; From patchwork Wed Jun 1 11:02:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12866727 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DBE74C433F5 for ; Wed, 1 Jun 2022 11:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wRC/f4G4Ku3r1jzZ5J3n0OFh+Z5skYrVqOtfKzcOzMY=; b=mI5pTsL1ip0xjb 5sVgp70eBkRuiBy/DyKpkmMGgNGme26DkS8M7ELfwcwMzRHsaNsvw6ARgbJQPJW5UVi1BGV6blW8U SH2MVCaQ12XbsoBlujEIObSKv5I7jz6QNBhKZANUuO9TVcdFyl2zgVs5yUFH/waHzF523PtBY3Hed q+8x2xK0HfinrFc3i4KNr0EOaxTXwu1MGwIAlk1kErq5Fp+4HGSahnGM7VtbWDU8JGr40VCT52vIt X5ZEcqXKG3EvcCgwm0SO/FdvsCMlNXXqGFgjHfFLf1TPMHgD4+bjSyPwpoltj4Q24av6iwUop48MW cQTIuvsh7HsFN3VVweag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM8Z-00FU0a-Je; Wed, 01 Jun 2022 11:03:40 +0000 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM87-00FTmP-Uq; Wed, 01 Jun 2022 11:03:14 +0000 Received: by mail-wr1-x433.google.com with SMTP id e25so1808188wra.11; Wed, 01 Jun 2022 04:03:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Oj0UTyy0MLszvmn9VYRtyrJ5EUtyanW7B83YKGtREoY=; b=q8JG6nQAxFI6QCloZp2Q4pXzLo3shCoqdhGDgiA2pBrA10VCaqcbmuAJsb25aI4/H/ uWFzuufhljnvhDTL+e3wGS7WRicznv36my3NbbggPbQkLXYfT+OZlRxNvXEfFZEof2+r tM26WAClQnO5mpxQpVckBTlaC4smj5qjrg9SQp3VvX1ezXtQLMy79HZbbjRzGyCdgTyg L2ZSMTCRNm6aJYXxX2OHDaap/pXi+yN9Ch5f1QA2UZEB5rYML1oO+bGfydSDlsGIHemX 5WH+AykVi/J2hNdYa9Zbr5ziLDTuPRpkLn5vLPCh6SWGn3ATpN5zkmHzP/sxM0sdTDH3 +4FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Oj0UTyy0MLszvmn9VYRtyrJ5EUtyanW7B83YKGtREoY=; b=gKN0Nw2FpTv19iI8bGWtV9hdxo0Kt6Et2VuNOwyU8RLAyJ41Ah2j+OyxOAdKSnvBQF cJ80onK2RiEOoBv0G66D4HWe91LjrfhGvROaoEy+kjXX+wz1AvcMDatR84Rodbd2VFiw JJN2JG6r2ZVxYxuHgc8VAe7wEvguitaVKoU/2iU8z96zaX4gB0hPtXlRICK3I4Dp9eAu PAT+8BPA9Mo9EzOQmhcR06jLEKnN6/NVUyN9E6Ckunbg9n3/LcAKujxbCFn5LrTgb47Y 1cf298E+QaLXByjAXyCD+U2Z2OO2T3JFUCF+tM4V47U/v3nYj+uJjR/TySlnL1QRomV8 PSFg== X-Gm-Message-State: AOAM531h1QNocaipd9o416aRakEU7DAT0Ov9KvExJGWJk6Y0oxYPq8TS x6HZwdzqbkj1SfLSlfk6A0A= X-Google-Smtp-Source: ABdhPJwDgJrEi99r+BoWVWJzPxWCtq5FeXvDr8rhpjp+LVsx1gRELhK179bEcDAWDnqDCwJUwzpCcQ== X-Received: by 2002:adf:fa81:0:b0:20e:69df:5f06 with SMTP id h1-20020adffa81000000b0020e69df5f06mr54912093wrr.188.1654081391561; Wed, 01 Jun 2022 04:03:11 -0700 (PDT) Received: from morpheus.home.roving-it.com (82-132-215-116.dab.02.net. [82.132.215.116]) by smtp.googlemail.com with ESMTPSA id j14-20020a05600c190e00b00397381a7ae8sm6074559wmq.30.2022.06.01.04.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 04:03:11 -0700 (PDT) From: Peter Robinson To: Arnd Bergmann , bcm-kernel-feedback-list@broadcom.com, Daniel Vetter , David Airlie , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, Emma Anholt , Florian Fainelli , javierm@redhat.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, maxime@cerno.tech, Nicolas Saenz Julienne , Rob Herring , Stefan Wahren , Catalin Marinas , Will Deacon Cc: Peter Robinson , Nicolas Saenz Julienne Subject: [PATCH v5 3/6] drm/v3d: Add support for bcm2711 Date: Wed, 1 Jun 2022 12:02:46 +0100 Message-Id: <20220601110249.569540-4-pbrobinson@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601110249.569540-1-pbrobinson@gmail.com> References: <20220601110249.569540-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220601_040312_014282_444234D6 X-CRM114-Status: GOOD ( 15.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add compatible string and Kconfig options for bcm2711. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson Reviewed-by: Stefan Wahren Reviewed-by: Javier Martinez Canillas --- Changes since v5: - Change compatible to align downstream and othee HW, reorder to suit drivers/gpu/drm/v3d/Kconfig | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig index e973ec487484..01d91c829107 100644 --- a/drivers/gpu/drm/v3d/Kconfig +++ b/drivers/gpu/drm/v3d/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_V3D tristate "Broadcom V3D 3.x and newer" - depends on ARCH_BCM || ARCH_BRCMSTB || COMPILE_TEST + depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST depends on DRM depends on COMMON_CLK depends on MMU diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index 56d5f831e48b..8c7f910daa28 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -191,6 +191,7 @@ static const struct drm_driver v3d_drm_driver = { }; static const struct of_device_id v3d_of_match[] = { + { .compatible = "brcm,2711-v3d" }, { .compatible = "brcm,7268-v3d" }, { .compatible = "brcm,7278-v3d" }, {}, From patchwork Wed Jun 1 11:02:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12866730 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2105FC433EF for ; Wed, 1 Jun 2022 11:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=79fzGbu4OtOwyZYRoWK8F50cZUFxk6jDuzXlpcRN5mM=; b=WvOxn2WpUR6za1 1k403y0YF3/AOIzajPICTVItZFIyj3OONcXMUBvH1LdI0O0num69dT34mYgxIQFjpU13wySnJfDyB 26fKEwUgo1UAIOdHnZ1FY5rLiQ8bNnZq49LfoiBduVfgKrsggpfdkB2COFJ18EBGyHix4mDk0cGqL CmXFzP0ZsysC0YeDKrJMY3Spg0AbH3j6T6CMi0cyClLDtv3ahPj9i4eObOOh/MTx0Bgz1h9YQsLZq zQACtSZXPixaBPP6PwwimMH6nK6NWMTtf3acMLUbVBfwGrpDEjOUE2vhVr05Kq7uRnzHkikwEZL6V wxstmfZFniKtlbtpgWWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM9J-00FUHE-9P; Wed, 01 Jun 2022 11:04:25 +0000 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM8D-00FTq8-OI; Wed, 01 Jun 2022 11:03:19 +0000 Received: by mail-wr1-x42b.google.com with SMTP id x17so1834889wrg.6; Wed, 01 Jun 2022 04:03:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q6tthIMoT4ruD6JHwzSQMleekGF9Zk9WpAchytaiYTM=; b=BVlIGd7DGxhP3kteQYVstjWADi5+sAeQTjsydIO0PG6YOts2TQa26BbXpRjb2JHqxV TaFgM5zKcMlO1QaUscfhF9C/IRbqGI3kGajtRGKvEBzLHXYBuMKORcxviEV9GAKFtMQM eNrf6HYo6jHiuXlHzeNbIc13VM9JneZ/DWSfU1PjZ6KmlcgfVMmX4juFE4k2GL01Go/Q j2TJoJNvvz/XUB2hADLuwSzac4/HC6uy8cLqjhBJ/YzQp4pAvs/RMJW2WCnBhQPhHIq/ fVvydLYJP1CwGb8lBIEZJwQ1JWjSJLPibrhMjV4MAjbD2gLLzGy78M3+fexCvOe6Bxnc 4WMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q6tthIMoT4ruD6JHwzSQMleekGF9Zk9WpAchytaiYTM=; b=q+DN+hflttSZ/KZ+hzz6KP2gR7HDCwcO/dC/CIjBJ663m9wYTVAN7L4+6SvPF7KYmp x5fkPyHlNPZfjetLz+vOAhpY3wwuG9fyVtkNhHAJrtPKtHwG9DQbPhpPpN1kbJwGUQ6Q 3rLaOUnwvPNqKQ4D2d9iXJNI04o6I1yNQboowHM8JH2W5ZA0RJuGaQ4Pol83AFjRKkMr TlIBYs3h9639HeMqsOROu+rUh5AiHHj8Y2+nSOQhJSKmKBGsQxPnMsCl+NAPpfyxfg11 lohy2r7X7D87XInLtogiqvXxRgrmQbqcLJXqvPlvV9rZiGgqhxPAZdnzx4jfptvzBxIy gjNg== X-Gm-Message-State: AOAM532hZgRIMgDbEhIRdZvnsGmG1eNMldHv5UZUEDZBVbrueJphLWbh HuD2VZJGQEvU2u3JQXoC7e4= X-Google-Smtp-Source: ABdhPJzLmmoS2dYg0CT3V1aVAnpDEFMEScwN3Ds9lW57/lngszZOr8vkmalkfzvnB1GkITDhJ2zlLQ== X-Received: by 2002:a5d:5888:0:b0:20d:270f:6b61 with SMTP id n8-20020a5d5888000000b0020d270f6b61mr52883493wrf.211.1654081393257; Wed, 01 Jun 2022 04:03:13 -0700 (PDT) Received: from morpheus.home.roving-it.com (82-132-215-116.dab.02.net. [82.132.215.116]) by smtp.googlemail.com with ESMTPSA id j14-20020a05600c190e00b00397381a7ae8sm6074559wmq.30.2022.06.01.04.03.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 04:03:12 -0700 (PDT) From: Peter Robinson To: Arnd Bergmann , bcm-kernel-feedback-list@broadcom.com, Daniel Vetter , David Airlie , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, Emma Anholt , Florian Fainelli , javierm@redhat.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, maxime@cerno.tech, Nicolas Saenz Julienne , Rob Herring , Stefan Wahren , Catalin Marinas , Will Deacon Cc: Peter Robinson , Nicolas Saenz Julienne Subject: [PATCH v5 4/6] ARM: dts: bcm2711: Enable V3D Date: Wed, 1 Jun 2022 12:02:47 +0100 Message-Id: <20220601110249.569540-5-pbrobinson@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601110249.569540-1-pbrobinson@gmail.com> References: <20220601110249.569540-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220601_040317_862064_3392E299 X-CRM114-Status: GOOD ( 11.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This adds the entry for V3D for bcm2711 (used in the Raspberry Pi 4) and the associated firmware clock entry. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson Reviewed-by: Javier Martinez Canillas --- Changes since v5: - Move the firmware clock to bcm2711-rpi.dtsi arch/arm/boot/dts/bcm2711-rpi.dtsi | 4 ++++ arch/arm/boot/dts/bcm2711.dtsi | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi index ca266c5d9f9b..98817a6675b9 100644 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -69,6 +69,10 @@ blconfig: nvram@0 { }; }; +&v3d { + clocks = <&firmware_clocks 5>; +}; + &vchiq { interrupts = ; }; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 89af57482bc8..177662257b16 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -601,6 +601,17 @@ genet_mdio: mdio@e14 { #size-cells = <0x0>; }; }; + + v3d: gpu@7ec00000 { + compatible = "brcm,bcm2711-v3d"; + reg = <0x0 0x7ec00000 0x4000>, + <0x0 0x7ec04000 0x4000>; + reg-names = "hub", "core0"; + + power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; + resets = <&pm BCM2835_RESET_V3D>; + interrupts = ; + }; }; }; From patchwork Wed Jun 1 11:02:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12866729 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0ED7DC433F5 for ; Wed, 1 Jun 2022 11:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mwWLnP11PFFFUCqVSn3EV4LLJ34uLJmkHN/Mrh5eVZE=; b=CnfZlFszbYSTEU /Soz2ViE1Kkuuho08vcQ8yCwKSBRPsCaz3qlnkKMa0yAfmGg59Ltn2MB+3aAO9FTQGXWDkX4PgjVk bj8JnVEzQeO9p891gNw46eCusktzQxWw/zZXv1pq/lnbGZL7JSO6seDYiyQkLcN1a1YODCYtvzq6a N6Sue0ecuKeyg5QZjj/OagGtKkTp71ogHyif8Tj0EZEROJ67dceoV/PT585BSODQz1TIRTdRKHlLG rO7d3YuCA3vQBgsWTxl80mDIm7yni00CnUmkycPeDU6dJsoISMzULoKifrMZca+xEexv4kQfZFvGb 7hce75hsWxk67u6aHvVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM8z-00FUA1-FJ; Wed, 01 Jun 2022 11:04:06 +0000 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM8B-00FTmP-Fw; Wed, 01 Jun 2022 11:03:17 +0000 Received: by mail-wr1-x433.google.com with SMTP id e25so1808188wra.11; Wed, 01 Jun 2022 04:03:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MY3KdiWHdb5CQcuaqFb688MwfgTh9jY8AmMC7tDgzHo=; b=B2HuTJfwnmOl4WdDoe7QPpkKb8j7BGWs2EhsQWktyoz2XAO0Neg5LZruqZ3XjcjThw Baq/ZVfjZ6dyh4cjdJDP7JrMr5FjF6gVNIbyzvz6GAXpr0Nx3xjUfIhWO2if1GMk2YlJ UadttVAbvqYnrSjhuiWUtB6useEV1VvdexIJe8OnoLamOjTuD1qn3zj7SxIUzF37ijee gz1z/lxM9RFCnPIcT3RdN0DmlsI+FkuFvDY7MfS4294hD8JtcoJjm8cFbrLUrS9rH6H5 sirXjmM4sN2AJnlWIdYPoN+I84bMebZ8pHCErDg9l8gNcY0fjf6+4o/ljcgOjrJnnXsH zpBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MY3KdiWHdb5CQcuaqFb688MwfgTh9jY8AmMC7tDgzHo=; b=ta/Dawk1g2Cs7uIv9efDGTxUvv7uvRBwbGZU7DpTYuYrppRzTSWYrCqsV8HuChBRMw FCwBB8cKVmpr3dbbQCuFmF003/owBlogSxY7tBaIOgrw6ACW38YM/jLMUKJ+IpAYiwc5 wU3O1eYngvZuxjb2OcpciJDjYezSsgghrrqMfTWYmU9VTlGpaxtCBFaCUjIWU021EhyX KgUb/t314PSITNI5VaXgOuQbFg90AFRDVOZzSuC3pZiiHZXsOL1ZFypvnAMX7WNk0eZM tkncm5CgXjsu0gmOoR4weOLuNQnV4TYq3rgbbfA7hTfC0fVMwboCNvPAHyIe0n2BAnxh ziwA== X-Gm-Message-State: AOAM530DeiIIWU1Cdm+2VnfxWCIQzossd08uKaoqZMu7BLqmSbKp49Qt ZdK6zQwueDY011bwlSpgXss= X-Google-Smtp-Source: ABdhPJyl7yv52MHioSjrQGG4AmhNAc90V9U32+IUh88qp//uyW424QckWORdAFdD9y/kIMs8k5Icjg== X-Received: by 2002:a05:6000:1d84:b0:20e:5fae:6e71 with SMTP id bk4-20020a0560001d8400b0020e5fae6e71mr54637691wrb.224.1654081395032; Wed, 01 Jun 2022 04:03:15 -0700 (PDT) Received: from morpheus.home.roving-it.com (82-132-215-116.dab.02.net. [82.132.215.116]) by smtp.googlemail.com with ESMTPSA id j14-20020a05600c190e00b00397381a7ae8sm6074559wmq.30.2022.06.01.04.03.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 04:03:14 -0700 (PDT) From: Peter Robinson To: Arnd Bergmann , bcm-kernel-feedback-list@broadcom.com, Daniel Vetter , David Airlie , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, Emma Anholt , Florian Fainelli , javierm@redhat.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, maxime@cerno.tech, Nicolas Saenz Julienne , Rob Herring , Stefan Wahren , Catalin Marinas , Will Deacon Cc: Peter Robinson , Nicolas Saenz Julienne Subject: [PATCH v5 5/6] ARM: configs: Enable DRM_V3D Date: Wed, 1 Jun 2022 12:02:48 +0100 Message-Id: <20220601110249.569540-6-pbrobinson@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601110249.569540-1-pbrobinson@gmail.com> References: <20220601110249.569540-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220601_040315_593984_7BD5CC61 X-CRM114-Status: GOOD ( 11.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org BCM2711, the SoC used on the Raspberry Pi 4 has a different 3D render GPU IP than its predecessors. Enable it it on multi v7 and bcm2835 configs. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson Reviewed-by: Stefan Wahren Reviewed-by: Javier Martinez Canillas --- Changes since v5: - Added to bcm2835_defconfig arch/arm/configs/bcm2835_defconfig | 1 + arch/arm/configs/multi_v7_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index a9ed79b7f871..9270512c14ea 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -106,6 +106,7 @@ CONFIG_REGULATOR_GPIO=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_DRM=y +CONFIG_DRM_V3D=y CONFIG_DRM_VC4=y CONFIG_FB_SIMPLE=y CONFIG_FRAMEBUFFER_CONSOLE=y diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index d6a6811f0539..e2db5cdc66b7 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -731,6 +731,7 @@ CONFIG_DRM_IMX_PARALLEL_DISPLAY=m CONFIG_DRM_IMX_TVE=m CONFIG_DRM_IMX_LDB=m CONFIG_DRM_IMX_HDMI=m +CONFIG_DRM_V3D=m CONFIG_DRM_VC4=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_MXSFB=m From patchwork Wed Jun 1 11:02:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12866731 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3FF33C433F5 for ; Wed, 1 Jun 2022 11:06:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BQMXgY997yyMmHFQCYwJo6R6aumpYkULQTfxInM0Sxw=; b=E+EnWW8SOIeBe0 /Ze3k0mW46iefCm08H7ZnflUALOHmxLXZaYOyuCyBiL4LGE8q0ksaRhM19UzQmh+fCtiJdYgQm2vM 3elNHq+NfKBpPgNO7Y+vOn7jkjsXv5eBH3wFt8z6DZzGfF1vCehVRewoMqfTlxgbrCNO7m+x50LYg ZBauKjXnJVGCs5TeUTZyoUoRzdKKUu94uWQ4bKda/PNNNuMofsnrN360fDgKrMkUnE/eL9in4e1H8 26fKOlOAY/VFvxi42H3MdXykx4YP+C6zr94TbjzksYTpsnx1TT5hFaRqGQHF2rjLbgsVYykDPGSmk nZh5uIrJ9h93yJssh5DA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM9i-00FUSD-KV; Wed, 01 Jun 2022 11:04:50 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwM8H-00FTrS-RX; Wed, 01 Jun 2022 11:03:23 +0000 Received: by mail-wm1-x32a.google.com with SMTP id 67-20020a1c1946000000b00397382b44f4so860399wmz.2; Wed, 01 Jun 2022 04:03:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fjf9xNl/MqQB/RPimZ4g9EOKQN/z4oldIhLZb2IukiM=; b=GmRxTPwPYrNCwNSsPIu1VTrOgW9rsJIJqoYWE4IOkuZ4c1KU1fjaWO3S7JlcvALdT3 PQ6v+2FD4F2rTJIRpXHez2tm6Ok/46+QfPEIbKpicsHk9ds9NpEtvsTA1IzIRInKxVu3 3Puq9O3ByF7gOdBoQFayvf7L4zYBfYCnNIMZll7JQIyNtlaUDif8ncgulQNGN5ad6jak TB/7zdZODU5L4c+FnZ5bvMdsdKQg4vbEAdD7tbhufVZiU2EHLqvT5rsA2FQfPZYWmDe3 KBycG0rnMSLAuP4HJe66kQBVfxZvY89v9R8qFdv9DqupseZIFKbvOvqp143sRxHI1ba1 sgbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fjf9xNl/MqQB/RPimZ4g9EOKQN/z4oldIhLZb2IukiM=; b=eRg4a/GtIAphW2csXJN9mq+e4rZlRZPEN79mfolejlSLPBeA0SyZzQv5YioYLQqPFS oV+phnSIt+mPHZ7bhT1u+ibDIYubq0foTd9IZ9SLhAKN/tkrie0GwH13wWTbE35nxOOb tNgtMRI4U/ct1BuJSD1lH1JBwsBf0HD94kgH3tI38TQvJpI0L3yg4jwuqv2J73omoHbG pEUBcCr1Ck+P2kO90nWxLwDJPNSUbZHfjecF9Z7deAJFYI3Fw/DN3jIibIJP4QY/QwBe 52M11RxxDzGhcxmPJo2XA0QX5/815L+CHtz22afEhTfVoI9USp+7b3Re2roJR7tEkXrP AuJA== X-Gm-Message-State: AOAM530ZGgOz3PsZQGLTkMqd2vUN3yolGChjRJDyWCeNY+PEb7PAYOzb 0Ecst53LIQsDU6bH546CX3s= X-Google-Smtp-Source: ABdhPJx5kYUlDNbTHYglJRLhh4T2fvS8bPm1arsI4PnjL43uMY6XoeM9y5jmJxz/v4fy8dIbqmmqSg== X-Received: by 2002:a7b:cc12:0:b0:37c:1ae:100a with SMTP id f18-20020a7bcc12000000b0037c01ae100amr27692085wmh.54.1654081396592; Wed, 01 Jun 2022 04:03:16 -0700 (PDT) Received: from morpheus.home.roving-it.com (82-132-215-116.dab.02.net. [82.132.215.116]) by smtp.googlemail.com with ESMTPSA id j14-20020a05600c190e00b00397381a7ae8sm6074559wmq.30.2022.06.01.04.03.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 04:03:16 -0700 (PDT) From: Peter Robinson To: Arnd Bergmann , bcm-kernel-feedback-list@broadcom.com, Daniel Vetter , David Airlie , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, Emma Anholt , Florian Fainelli , javierm@redhat.com, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, maxime@cerno.tech, Nicolas Saenz Julienne , Rob Herring , Stefan Wahren , Catalin Marinas , Will Deacon Cc: Nicolas Saenz Julienne , Peter Robinson Subject: [PATCH v5 6/6] arm64: config: Enable DRM_V3D Date: Wed, 1 Jun 2022 12:02:49 +0100 Message-Id: <20220601110249.569540-7-pbrobinson@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601110249.569540-1-pbrobinson@gmail.com> References: <20220601110249.569540-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220601_040321_943322_1B06A161 X-CRM114-Status: GOOD ( 10.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Nicolas Saenz Julienne BCM2711, the SoC used on the Raspberry Pi 4 has a different GPU than its predecessors. Enable it. Signed-off-by: Nicolas Saenz Julienne Signed-off-by: Peter Robinson Reviewed-by: Stefan Wahren Reviewed-by: Javier Martinez Canillas --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 50aa3d75ab4f..446bac1ef774 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -738,6 +738,7 @@ CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_IMX_DCSS=m +CONFIG_DRM_V3D=m CONFIG_DRM_VC4=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_HISI_HIBMC=m