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.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,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 998BEC2BA18 for ; Thu, 2 Apr 2020 17:09:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A0D7215A4 for ; Thu, 2 Apr 2020 17:09:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A0D7215A4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7D076EA85; Thu, 2 Apr 2020 17:09:49 +0000 (UTC) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id E7F986EACE for ; Thu, 2 Apr 2020 17:09:47 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: bbeckett) with ESMTPSA id 76B35297E47 From: Robert Beckett To: Lucas Stach , Russell King , Christian Gmeiner , David Airlie Subject: [PATCH v4.9.y] drm/etnaviv: replace MMU flush marker with flush sequence Date: Thu, 2 Apr 2020 18:07:59 +0100 Message-Id: <20200402170758.8315-4-bob.beckett@collabora.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200402170758.8315-1-bob.beckett@collabora.com> References: <20200402170758.8315-1-bob.beckett@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: bob.beckett@collabora.com Cc: Robert Beckett , =?UTF-8?q?Guido=20G=C3=BCnther?= , linux-kernel@vger.kernel.org, stable@vger.kernel.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" RnJvbTogTHVjYXMgU3RhY2ggPGwuc3RhY2hAcGVuZ3V0cm9uaXguZGU+Cgpjb21taXQgNDkwMGRk YTkwYWYyY2IxM2JjMWQ0YzEyY2U5NGI5OGFjYzhmZTY0ZSB1cHN0cmVhbQoKSWYgYSBNTVUgaXMg c2hhcmVkIGJldHdlZW4gbXVsdGlwbGUgR1BVcywgYWxsIG9mIHRoZW0gbmVlZCB0byBmbHVzaCB0 aGVpcgpUTEJzLCBzbyBhIHNpbmdsZSBtYXJrZXIgdGhhdCBnZXRzIHJlc2V0IG9uIHRoZSBmaXJz dCBmbHVzaCB3b24ndCBkby4KUmVwbGFjZSB0aGUgZmx1c2ggbWFya2VyIHdpdGggYSBzZXF1ZW5j ZSBudW1iZXIsIHNvIHRoYXQgaXQncyBwb3NzaWJsZSB0bwpjaGVjayBpZiB0aGUgVExCIGlzIGlu IHN5bmMgd2l0aCB0aGUgY3VycmVudCBwYWdlIHRhYmxlIHN0YXRlIGZvciBlYWNoIEdQVS4KClNp Z25lZC1vZmYtYnk6IEx1Y2FzIFN0YWNoIDxsLnN0YWNoQHBlbmd1dHJvbml4LmRlPgpSZXZpZXdl ZC1ieTogUGhpbGlwcCBaYWJlbCA8cC56YWJlbEBwZW5ndXRyb25peC5kZT4KUmV2aWV3ZWQtYnk6 IEd1aWRvIEfDvG50aGVyIDxhZ3hAc2lneGNwdS5vcmc+ClNpZ25lZC1vZmYtYnk6IFJvYmVydCBC ZWNrZXR0IDxib2IuYmVja2V0dEBjb2xsYWJvcmEuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9l dG5hdml2L2V0bmF2aXZfYnVmZmVyLmMgfCAxMCArKysrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0v ZXRuYXZpdi9ldG5hdml2X2dwdS5jICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9ldG5hdml2 L2V0bmF2aXZfZ3B1LmggICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2 X21tdS5jICAgIHwgIDYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X21t dS5oICAgIHwgIDIgKy0KIDUgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgOSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X2J1 ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9idWZmZXIuYwppbmRleCBk OTIzMDEzMmRmYmMuLmQ3MWZhMmQ5YTE5NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2V0 bmF2aXYvZXRuYXZpdl9idWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5h dml2X2J1ZmZlci5jCkBAIC0yNTcsNiArMjU3LDggQEAgdm9pZCBldG5hdml2X2J1ZmZlcl9xdWV1 ZShzdHJ1Y3QgZXRuYXZpdl9ncHUgKmdwdSwgdW5zaWduZWQgaW50IGV2ZW50LAogCXVuc2lnbmVk IGludCB3YWl0bGlua19vZmZzZXQgPSBidWZmZXItPnVzZXJfc2l6ZSAtIDE2OwogCXUzMiByZXR1 cm5fdGFyZ2V0LCByZXR1cm5fZHdvcmRzOwogCXUzMiBsaW5rX3RhcmdldCwgbGlua19kd29yZHM7 CisJdW5zaWduZWQgaW50IG5ld19mbHVzaF9zZXEgPSBSRUFEX09OQ0UoZ3B1LT5tbXUtPmZsdXNo X3NlcSk7CisJYm9vbCBuZWVkX2ZsdXNoID0gZ3B1LT5mbHVzaF9zZXEgIT0gbmV3X2ZsdXNoX3Nl cTsKIAogCWlmIChkcm1fZGVidWcgJiBEUk1fVVRfRFJJVkVSKQogCQlldG5hdml2X2J1ZmZlcl9k dW1wKGdwdSwgYnVmZmVyLCAwLCAweDUwKTsKQEAgLTI2OSwxNCArMjcxLDE0IEBAIHZvaWQgZXRu YXZpdl9idWZmZXJfcXVldWUoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUsIHVuc2lnbmVkIGludCBl dmVudCwKIAkgKiBuZWVkIHRvIGFwcGVuZCBhIG1tdSBmbHVzaCBsb2FkIHN0YXRlLCBmb2xsb3dl ZCBieSBhIG5ldwogCSAqIGxpbmsgdG8gdGhpcyBidWZmZXIgLSBhIHRvdGFsIG9mIGZvdXIgYWRk aXRpb25hbCB3b3Jkcy4KIAkgKi8KLQlpZiAoZ3B1LT5tbXUtPm5lZWRfZmx1c2ggfHwgZ3B1LT5z d2l0Y2hfY29udGV4dCkgeworCWlmIChuZWVkX2ZsdXNoIHx8IGdwdS0+c3dpdGNoX2NvbnRleHQp IHsKIAkJdTMyIHRhcmdldCwgZXh0cmFfZHdvcmRzOwogCiAJCS8qIGxpbmsgY29tbWFuZCAqLwog CQlleHRyYV9kd29yZHMgPSAxOwogCiAJCS8qIGZsdXNoIGNvbW1hbmQgKi8KLQkJaWYgKGdwdS0+ bW11LT5uZWVkX2ZsdXNoKSB7CisJCWlmIChuZWVkX2ZsdXNoKSB7CiAJCQlpZiAoZ3B1LT5tbXUt PnZlcnNpb24gPT0gRVROQVZJVl9JT01NVV9WMSkKIAkJCQlleHRyYV9kd29yZHMgKz0gMTsKIAkJ CWVsc2UKQEAgLTI4OSw3ICsyOTEsNyBAQCB2b2lkIGV0bmF2aXZfYnVmZmVyX3F1ZXVlKHN0cnVj dCBldG5hdml2X2dwdSAqZ3B1LCB1bnNpZ25lZCBpbnQgZXZlbnQsCiAKIAkJdGFyZ2V0ID0gZXRu YXZpdl9idWZmZXJfcmVzZXJ2ZShncHUsIGJ1ZmZlciwgZXh0cmFfZHdvcmRzKTsKIAotCQlpZiAo Z3B1LT5tbXUtPm5lZWRfZmx1c2gpIHsKKwkJaWYgKG5lZWRfZmx1c2gpIHsKIAkJCS8qIEFkZCB0 aGUgTU1VIGZsdXNoICovCiAJCQlpZiAoZ3B1LT5tbXUtPnZlcnNpb24gPT0gRVROQVZJVl9JT01N VV9WMSkgewogCQkJCUNNRF9MT0FEX1NUQVRFKGJ1ZmZlciwgVklWU19HTF9GTFVTSF9NTVUsCkBA IC0zMDksNyArMzExLDcgQEAgdm9pZCBldG5hdml2X2J1ZmZlcl9xdWV1ZShzdHJ1Y3QgZXRuYXZp dl9ncHUgKmdwdSwgdW5zaWduZWQgaW50IGV2ZW50LAogCQkJCQlTWU5DX1JFQ0lQSUVOVF9QRSk7 CiAJCQl9CiAKLQkJCWdwdS0+bW11LT5uZWVkX2ZsdXNoID0gZmFsc2U7CisJCQlncHUtPmZsdXNo X3NlcSA9IG5ld19mbHVzaF9zZXE7CiAJCX0KIAogCQlpZiAoZ3B1LT5zd2l0Y2hfY29udGV4dCkg ewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9ncHUuYyBiL2Ry aXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfZ3B1LmMKaW5kZXggYTMzNjc1NDY5OGY4Li5k YmEwZDc2OWQxN2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZf Z3B1LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9ncHUuYwpAQCAtMTMx Myw3ICsxMzEzLDcgQEAgaW50IGV0bmF2aXZfZ3B1X3N1Ym1pdChzdHJ1Y3QgZXRuYXZpdl9ncHUg KmdwdSwKIAlncHUtPmFjdGl2ZV9mZW5jZSA9IHN1Ym1pdC0+ZmVuY2U7CiAKIAlpZiAoZ3B1LT5s YXN0Y3R4ICE9IGNtZGJ1Zi0+Y3R4KSB7Ci0JCWdwdS0+bW11LT5uZWVkX2ZsdXNoID0gdHJ1ZTsK KwkJZ3B1LT5tbXUtPmZsdXNoX3NlcSsrOwogCQlncHUtPnN3aXRjaF9jb250ZXh0ID0gdHJ1ZTsK IAkJZ3B1LT5sYXN0Y3R4ID0gY21kYnVmLT5jdHg7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9ncHUuaCBiL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0 bmF2aXZfZ3B1LmgKaW5kZXggNzNjMjc4ZGMzNzA2Li40MTY5NDBiMjU0YTYgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2V0bmF2aXYvZXRuYXZpdl9ncHUuaApAQCAtMTM1LDYgKzEzNSw3IEBAIHN0cnVjdCBldG5h dml2X2dwdSB7CiAJaW50IGlycTsKIAogCXN0cnVjdCBldG5hdml2X2lvbW11ICptbXU7CisJdW5z aWduZWQgaW50IGZsdXNoX3NlcTsKIAogCS8qIFBvd2VyIENvbnRyb2w6ICovCiAJc3RydWN0IGNs ayAqY2xrX2J1czsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZf bW11LmMgYi9kcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X21tdS5jCmluZGV4IGZlMGU4 NWI0MTMxMC4uZWY5ZGY2MTU4ZGMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZXRuYXZp di9ldG5hdml2X21tdS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfbW11 LmMKQEAgLTEzNCw3ICsxMzQsNyBAQCBzdGF0aWMgaW50IGV0bmF2aXZfaW9tbXVfZmluZF9pb3Zh KHN0cnVjdCBldG5hdml2X2lvbW11ICptbXUsCiAJCSAqLwogCQlpZiAobW11LT5sYXN0X2lvdmEp IHsKIAkJCW1tdS0+bGFzdF9pb3ZhID0gMDsKLQkJCW1tdS0+bmVlZF9mbHVzaCA9IHRydWU7CisJ CQltbXUtPmZsdXNoX3NlcSsrOwogCQkJY29udGludWU7CiAJCX0KIApAQCAtMTk3LDcgKzE5Nyw3 IEBAIHN0YXRpYyBpbnQgZXRuYXZpdl9pb21tdV9maW5kX2lvdmEoc3RydWN0IGV0bmF2aXZfaW9t bXUgKm1tdSwKIAkJICogYXNzb2NpYXRlZCBjb21taXQgcmVxdWVzdGluZyB0aGlzIG1hcHBpbmcs IGFuZCByZXRyeSB0aGUKIAkJICogYWxsb2NhdGlvbiBvbmUgbW9yZSB0aW1lLgogCQkgKi8KLQkJ bW11LT5uZWVkX2ZsdXNoID0gdHJ1ZTsKKwkJbW11LT5mbHVzaF9zZXErKzsKIAl9CiAKIAlyZXR1 cm4gcmV0OwpAQCAtMzU0LDcgKzM1NCw3IEBAIHUzMiBldG5hdml2X2lvbW11X2dldF9jbWRidWZf dmEoc3RydWN0IGV0bmF2aXZfZ3B1ICpncHUsCiAJCSAqIHRoYXQgdGhlIEZFIE1NVSBwcmVmZXRj aCB3b24ndCBsb2FkIGludmFsaWQgZW50cmllcy4KIAkJICovCiAJCW1tdS0+bGFzdF9pb3ZhID0g YnVmLT52cmFtX25vZGUuc3RhcnQgKyBidWYtPnNpemUgKyBTWl82NEs7Ci0JCWdwdS0+bW11LT5u ZWVkX2ZsdXNoID0gdHJ1ZTsKKwkJbW11LT5mbHVzaF9zZXErKzsKIAkJbXV0ZXhfdW5sb2NrKCZt bXUtPmxvY2spOwogCiAJCXJldHVybiAodTMyKWJ1Zi0+dnJhbV9ub2RlLnN0YXJ0OwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9tbXUuaCBiL2RyaXZlcnMvZ3B1 L2RybS9ldG5hdml2L2V0bmF2aXZfbW11LmgKaW5kZXggZTc4N2U0OWM5NjkzLi41YmRjNWY1NjAx YjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfbW11LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9tbXUuaApAQCAtNDQsNyArNDQsNyBA QCBzdHJ1Y3QgZXRuYXZpdl9pb21tdSB7CiAJc3RydWN0IGxpc3RfaGVhZCBtYXBwaW5nczsKIAlz dHJ1Y3QgZHJtX21tIG1tOwogCXUzMiBsYXN0X2lvdmE7Ci0JYm9vbCBuZWVkX2ZsdXNoOworCXVu c2lnbmVkIGludCBmbHVzaF9zZXE7CiB9OwogCiBzdHJ1Y3QgZXRuYXZpdl9nZW1fb2JqZWN0Owot LSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK