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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 41720C64EB4 for ; Sat, 1 Dec 2018 00:58:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 021DB20645 for ; Sat, 1 Dec 2018 00:58:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 021DB20645 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anholt.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726860AbeLAMJc (ORCPT ); Sat, 1 Dec 2018 07:09:32 -0500 Received: from anholt.net ([50.246.234.109]:42758 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726666AbeLAMJR (ORCPT ); Sat, 1 Dec 2018 07:09:17 -0500 Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id CE7B910A1570; Fri, 30 Nov 2018 16:58:04 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at anholt.net Received: from anholt.net ([127.0.0.1]) by localhost (kingsolver.anholt.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Gf_0sOPTBtFc; Fri, 30 Nov 2018 16:58:03 -0800 (PST) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 6E8AA10A1218; Fri, 30 Nov 2018 16:58:00 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 626372FE2D16; Fri, 30 Nov 2018 16:57:59 -0800 (PST) From: Eric Anholt To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Dave Emett , Thomas Spurden , Eric Anholt Subject: [PATCH 2/6] drm/v3d: Drop unused v3d_flush_caches(). Date: Fri, 30 Nov 2018 16:57:55 -0800 Message-Id: <20181201005759.28093-2-eric@anholt.net> X-Mailer: git-send-email 2.20.0.rc1 In-Reply-To: <20181201005759.28093-1-eric@anholt.net> References: <20181201005759.28093-1-eric@anholt.net> 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 I've specified how the end-of-pipeline flushing should work, we're never going to use this function. Signed-off-by: Eric Anholt --- drivers/gpu/drm/v3d/v3d_drv.h | 1 - drivers/gpu/drm/v3d/v3d_gem.c | 21 --------------------- 2 files changed, 22 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h index bcd3d567bec2..239b56d76f3e 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -314,7 +314,6 @@ void v3d_exec_put(struct v3d_exec_info *exec); void v3d_tfu_job_put(struct v3d_tfu_job *exec); void v3d_reset(struct v3d_dev *v3d); void v3d_invalidate_caches(struct v3d_dev *v3d); -void v3d_flush_caches(struct v3d_dev *v3d); /* v3d_irq.c */ void v3d_irq_init(struct v3d_dev *v3d); diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 8b4af512450f..34103205b7cb 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -175,20 +175,6 @@ v3d_invalidate_slices(struct v3d_dev *v3d, int core) V3D_SET_FIELD(0xf, V3D_SLCACTL_ICC)); } -/* Invalidates texture L2 cachelines */ -static void -v3d_invalidate_l2t(struct v3d_dev *v3d, int core) -{ - V3D_CORE_WRITE(core, - V3D_CTL_L2TCACTL, - V3D_L2TCACTL_L2TFLS | - V3D_SET_FIELD(V3D_L2TCACTL_FLM_CLEAR, V3D_L2TCACTL_FLM)); - if (wait_for(!(V3D_CORE_READ(core, V3D_CTL_L2TCACTL) & - V3D_L2TCACTL_L2TFLS), 100)) { - DRM_ERROR("Timeout waiting for L2T invalidate\n"); - } -} - void v3d_invalidate_caches(struct v3d_dev *v3d) { @@ -199,13 +185,6 @@ v3d_invalidate_caches(struct v3d_dev *v3d) v3d_flush_l2t(v3d, 0); } -void -v3d_flush_caches(struct v3d_dev *v3d) -{ - v3d_invalidate_l1td(v3d, 0); - v3d_invalidate_l2t(v3d, 0); -} - static void v3d_attach_object_fences(struct v3d_bo **bos, int bo_count, struct dma_fence *fence) -- 2.20.0.rc1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: [PATCH 2/6] drm/v3d: Drop unused v3d_flush_caches(). Date: Fri, 30 Nov 2018 16:57:55 -0800 Message-ID: <20181201005759.28093-2-eric@anholt.net> References: <20181201005759.28093-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 103236E6C1 for ; Sat, 1 Dec 2018 00:58:05 +0000 (UTC) In-Reply-To: <20181201005759.28093-1-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Dave Emett , Thomas Spurden , linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org Tm93IHRoYXQgSSd2ZSBzcGVjaWZpZWQgaG93IHRoZSBlbmQtb2YtcGlwZWxpbmUgZmx1c2hpbmcg c2hvdWxkIHdvcmssCndlJ3JlIG5ldmVyIGdvaW5nIHRvIHVzZSB0aGlzIGZ1bmN0aW9uLgoKU2ln bmVkLW9mZi1ieTogRXJpYyBBbmhvbHQgPGVyaWNAYW5ob2x0Lm5ldD4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vdjNkL3YzZF9kcnYuaCB8ICAxIC0KIGRyaXZlcnMvZ3B1L2RybS92M2QvdjNkX2dlbS5j IHwgMjEgLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNkX2Rydi5oIGIvZHJpdmVy cy9ncHUvZHJtL3YzZC92M2RfZHJ2LmgKaW5kZXggYmNkM2Q1NjdiZWMyLi4yMzliNTZkNzZmM2Ug MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNkX2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS92M2QvdjNkX2Rydi5oCkBAIC0zMTQsNyArMzE0LDYgQEAgdm9pZCB2M2RfZXhlY19w dXQoc3RydWN0IHYzZF9leGVjX2luZm8gKmV4ZWMpOwogdm9pZCB2M2RfdGZ1X2pvYl9wdXQoc3Ry dWN0IHYzZF90ZnVfam9iICpleGVjKTsKIHZvaWQgdjNkX3Jlc2V0KHN0cnVjdCB2M2RfZGV2ICp2 M2QpOwogdm9pZCB2M2RfaW52YWxpZGF0ZV9jYWNoZXMoc3RydWN0IHYzZF9kZXYgKnYzZCk7Ci12 b2lkIHYzZF9mbHVzaF9jYWNoZXMoc3RydWN0IHYzZF9kZXYgKnYzZCk7CiAKIC8qIHYzZF9pcnEu YyAqLwogdm9pZCB2M2RfaXJxX2luaXQoc3RydWN0IHYzZF9kZXYgKnYzZCk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNk X2dlbS5jCmluZGV4IDhiNGFmNTEyNDUwZi4uMzQxMDMyMDViN2NiIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vdjNkL3YzZF9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9n ZW0uYwpAQCAtMTc1LDIwICsxNzUsNiBAQCB2M2RfaW52YWxpZGF0ZV9zbGljZXMoc3RydWN0IHYz ZF9kZXYgKnYzZCwgaW50IGNvcmUpCiAJCSAgICAgICBWM0RfU0VUX0ZJRUxEKDB4ZiwgVjNEX1NM Q0FDVExfSUNDKSk7CiB9CiAKLS8qIEludmFsaWRhdGVzIHRleHR1cmUgTDIgY2FjaGVsaW5lcyAq Lwotc3RhdGljIHZvaWQKLXYzZF9pbnZhbGlkYXRlX2wydChzdHJ1Y3QgdjNkX2RldiAqdjNkLCBp bnQgY29yZSkKLXsKLQlWM0RfQ09SRV9XUklURShjb3JlLAotCQkgICAgICAgVjNEX0NUTF9MMlRD QUNUTCwKLQkJICAgICAgIFYzRF9MMlRDQUNUTF9MMlRGTFMgfAotCQkgICAgICAgVjNEX1NFVF9G SUVMRChWM0RfTDJUQ0FDVExfRkxNX0NMRUFSLCBWM0RfTDJUQ0FDVExfRkxNKSk7Ci0JaWYgKHdh aXRfZm9yKCEoVjNEX0NPUkVfUkVBRChjb3JlLCBWM0RfQ1RMX0wyVENBQ1RMKSAmCi0JCSAgICAg ICBWM0RfTDJUQ0FDVExfTDJURkxTKSwgMTAwKSkgewotCQlEUk1fRVJST1IoIlRpbWVvdXQgd2Fp dGluZyBmb3IgTDJUIGludmFsaWRhdGVcbiIpOwotCX0KLX0KLQogdm9pZAogdjNkX2ludmFsaWRh dGVfY2FjaGVzKHN0cnVjdCB2M2RfZGV2ICp2M2QpCiB7CkBAIC0xOTksMTMgKzE4NSw2IEBAIHYz ZF9pbnZhbGlkYXRlX2NhY2hlcyhzdHJ1Y3QgdjNkX2RldiAqdjNkKQogCXYzZF9mbHVzaF9sMnQo djNkLCAwKTsKIH0KIAotdm9pZAotdjNkX2ZsdXNoX2NhY2hlcyhzdHJ1Y3QgdjNkX2RldiAqdjNk KQotewotCXYzZF9pbnZhbGlkYXRlX2wxdGQodjNkLCAwKTsKLQl2M2RfaW52YWxpZGF0ZV9sMnQo djNkLCAwKTsKLX0KLQogc3RhdGljIHZvaWQKIHYzZF9hdHRhY2hfb2JqZWN0X2ZlbmNlcyhzdHJ1 Y3QgdjNkX2JvICoqYm9zLCBpbnQgYm9fY291bnQsCiAJCQkgc3RydWN0IGRtYV9mZW5jZSAqZmVu Y2UpCi0tIAoyLjIwLjAucmMxCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK