From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: [PATCH 7/7] drm/lima: Use the drm_gem_fence_array_add helpers for our deps. Date: Mon, 1 Apr 2019 15:26:35 -0700 Message-ID: <20190401222635.25013-8-eric@anholt.net> References: <20190401222635.25013-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 9FF0D6E29E for ; Mon, 1 Apr 2019 22:26:57 +0000 (UTC) In-Reply-To: <20190401222635.25013-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: thomas.spurden@broadcom.com, linux-kernel@vger.kernel.org, david.emett@broadcom.com, Qiang Yu List-Id: dri-devel@lists.freedesktop.org SSBoYXZlbid0IHRlc3RlZCB0aGlzLCBidXQgaXQncyBhIHByZXR0eSBkaXJlY3QgcG9ydCBvZiB3 aGF0IEkgZGlkIGZvcgp2M2QuCgpTaWduZWQtb2ZmLWJ5OiBFcmljIEFuaG9sdCA8ZXJpY0Bhbmhv bHQubmV0PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9saW1hL2xpbWFfZ2VtLmMgICB8IDM3ICstLS0t LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vbGltYS9saW1hX3NjaGVkLmMgfCA2NiArKysr KystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vbGltYS9saW1hX3Nj aGVkLmggfCAgNiArLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgOTMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2xpbWEvbGltYV9nZW0uYyBi L2RyaXZlcnMvZ3B1L2RybS9saW1hL2xpbWFfZ2VtLmMKaW5kZXggMmQzY2Y5NmY2YzU4Li44Zjgw Mjg2YzgwYjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9saW1hL2xpbWFfZ2VtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2xpbWEvbGltYV9nZW0uYwpAQCAtMTQ0LDQwICsxNDQsNyBAQCBz dGF0aWMgaW50IGxpbWFfZ2VtX3N5bmNfYm8oc3RydWN0IGxpbWFfc2NoZWRfdGFzayAqdGFzaywg c3RydWN0IGxpbWFfYm8gKmJvLAogCWlmIChleHBsaWNpdCkKIAkJcmV0dXJuIDA7CiAKLQkvKiBp bXBsaWNpdCBzeW5jIHVzZSBibyBmZW5jZSBpbiByZXN2IG9iaiAqLwotCWlmICh3cml0ZSkgewot CQl1bnNpZ25lZCBucl9mZW5jZXM7Ci0JCXN0cnVjdCBkbWFfZmVuY2UgKipmZW5jZXM7Ci0JCWlu dCBpOwotCi0JCWVyciA9IHJlc2VydmF0aW9uX29iamVjdF9nZXRfZmVuY2VzX3JjdSgKLQkJCWJv LT5nZW0ucmVzdiwgTlVMTCwgJm5yX2ZlbmNlcywgJmZlbmNlcyk7Ci0JCWlmIChlcnIgfHwgIW5y X2ZlbmNlcykKLQkJCXJldHVybiBlcnI7Ci0KLQkJZm9yIChpID0gMDsgaSA8IG5yX2ZlbmNlczsg aSsrKSB7Ci0JCQllcnIgPSBsaW1hX3NjaGVkX3Rhc2tfYWRkX2RlcCh0YXNrLCBmZW5jZXNbaV0p OwotCQkJaWYgKGVycikKLQkJCQlicmVhazsKLQkJfQotCi0JCS8qIGZvciBlcnJvciBjYXNlIGZy ZWUgcmVtYWluaW5nIGZlbmNlcyAqLwotCQlmb3IgKCA7IGkgPCBucl9mZW5jZXM7IGkrKykKLQkJ CWRtYV9mZW5jZV9wdXQoZmVuY2VzW2ldKTsKLQotCQlrZnJlZShmZW5jZXMpOwotCX0gZWxzZSB7 Ci0JCXN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlOwotCi0JCWZlbmNlID0gcmVzZXJ2YXRpb25fb2Jq ZWN0X2dldF9leGNsX3JjdShiby0+Z2VtLnJlc3YpOwotCQlpZiAoZmVuY2UpIHsKLQkJCWVyciA9 IGxpbWFfc2NoZWRfdGFza19hZGRfZGVwKHRhc2ssIGZlbmNlKTsKLQkJCWlmIChlcnIpCi0JCQkJ ZG1hX2ZlbmNlX3B1dChmZW5jZSk7Ci0JCX0KLQl9Ci0KLQlyZXR1cm4gZXJyOworCXJldHVybiBk cm1fZ2VtX2ZlbmNlX2FycmF5X2FkZF9pbXBsaWNpdCgmdGFzay0+ZGVwcywgJmJvLT5nZW0sIHdy aXRlKTsKIH0KIAogc3RhdGljIGludCBsaW1hX2dlbV9sb2NrX2JvcyhzdHJ1Y3QgbGltYV9ibyAq KmJvcywgdTMyIG5yX2JvcywKQEAgLTI1MCw3ICsyMTcsNyBAQCBzdGF0aWMgaW50IGxpbWFfZ2Vt X2FkZF9kZXBzKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwgc3RydWN0IGxpbWFfc3VibWl0ICpzdWJt aXQpCiAJCWlmIChlcnIpCiAJCQlyZXR1cm4gZXJyOwogCi0JCWVyciA9IGxpbWFfc2NoZWRfdGFz a19hZGRfZGVwKHN1Ym1pdC0+dGFzaywgZmVuY2UpOworCQllcnIgPSBkcm1fZ2VtX2ZlbmNlX2Fy cmF5X2FkZCgmc3VibWl0LT50YXNrLT5kZXBzLCBmZW5jZSk7CiAJCWlmIChlcnIpIHsKIAkJCWRt YV9mZW5jZV9wdXQoZmVuY2UpOwogCQkJcmV0dXJuIGVycjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9saW1hL2xpbWFfc2NoZWQuYyBiL2RyaXZlcnMvZ3B1L2RybS9saW1hL2xpbWFfc2No ZWQuYwppbmRleCA5N2JkOWMxZGViODcuLmUyNTNkMDMxZmIzZCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2xpbWEvbGltYV9zY2hlZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9saW1hL2xp bWFfc2NoZWQuYwpAQCAtMyw2ICszLDcgQEAKIAogI2luY2x1ZGUgPGxpbnV4L2t0aHJlYWQuaD4K ICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+CisjaW5jbHVkZSA8bGludXgveGFycmF5Lmg+CiAKICNp bmNsdWRlICJsaW1hX2Rydi5oIgogI2luY2x1ZGUgImxpbWFfc2NoZWQuaCIKQEAgLTEyNiwxOSAr MTI3LDI0IEBAIGludCBsaW1hX3NjaGVkX3Rhc2tfaW5pdChzdHJ1Y3QgbGltYV9zY2hlZF90YXNr ICp0YXNrLAogCiAJdGFzay0+bnVtX2JvcyA9IG51bV9ib3M7CiAJdGFzay0+dm0gPSBsaW1hX3Zt X2dldCh2bSk7CisKKwl4YV9pbml0X2ZsYWdzKCZ0YXNrLT5kZXBzLCBYQV9GTEFHU19BTExPQyk7 CisKIAlyZXR1cm4gMDsKIH0KIAogdm9pZCBsaW1hX3NjaGVkX3Rhc2tfZmluaShzdHJ1Y3QgbGlt YV9zY2hlZF90YXNrICp0YXNrKQogeworCXN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlOworCXVuc2ln bmVkIGxvbmcgaW5kZXg7CiAJaW50IGk7CiAKIAlkcm1fc2NoZWRfam9iX2NsZWFudXAoJnRhc2st PmJhc2UpOwogCi0JZm9yIChpID0gMDsgaSA8IHRhc2stPm51bV9kZXA7IGkrKykKLQkJZG1hX2Zl bmNlX3B1dCh0YXNrLT5kZXBbaV0pOwotCi0Ja2ZyZWUodGFzay0+ZGVwKTsKKwl4YV9mb3JfZWFj aCgmdGFzay0+ZGVwcywgaW5kZXgsIGZlbmNlKSB7CisJCWRtYV9mZW5jZV9wdXQoZmVuY2UpOwor CX0KKwl4YV9kZXN0cm95KCZ0YXNrLT5kZXBzKTsKIAogCWlmICh0YXNrLT5ib3MpIHsKIAkJZm9y IChpID0gMDsgaSA8IHRhc2stPm51bV9ib3M7IGkrKykKQEAgLTE0OSw0MiArMTU1LDYgQEAgdm9p ZCBsaW1hX3NjaGVkX3Rhc2tfZmluaShzdHJ1Y3QgbGltYV9zY2hlZF90YXNrICp0YXNrKQogCWxp bWFfdm1fcHV0KHRhc2stPnZtKTsKIH0KIAotaW50IGxpbWFfc2NoZWRfdGFza19hZGRfZGVwKHN0 cnVjdCBsaW1hX3NjaGVkX3Rhc2sgKnRhc2ssIHN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlKQotewot CWludCBpLCBuZXdfZGVwID0gNDsKLQotCS8qIHNhbWUgY29udGV4dCdzIGZlbmNlIGlzIGRlZmlu aXRseSBlYXJsaWVyIHRoZW4gdGhpcyB0YXNrICovCi0JaWYgKGZlbmNlLT5jb250ZXh0ID09IHRh c2stPmJhc2Uuc19mZW5jZS0+ZmluaXNoZWQuY29udGV4dCkgewotCQlkbWFfZmVuY2VfcHV0KGZl bmNlKTsKLQkJcmV0dXJuIDA7Ci0JfQotCi0JaWYgKHRhc2stPmRlcCAmJiB0YXNrLT5udW1fZGVw ID09IHRhc2stPm1heF9kZXApCi0JCW5ld19kZXAgPSB0YXNrLT5tYXhfZGVwICogMjsKLQotCWlm ICh0YXNrLT5tYXhfZGVwIDwgbmV3X2RlcCkgewotCQl2b2lkICpkZXAgPSBrcmVhbGxvYyh0YXNr LT5kZXAsIHNpemVvZigqdGFzay0+ZGVwKSAqIG5ld19kZXAsIEdGUF9LRVJORUwpOwotCi0JCWlm ICghZGVwKQotCQkJcmV0dXJuIC1FTk9NRU07Ci0KLQkJdGFzay0+bWF4X2RlcCA9IG5ld19kZXA7 Ci0JCXRhc2stPmRlcCA9IGRlcDsKLQl9Ci0KLQlmb3IgKGkgPSAwOyBpIDwgdGFzay0+bnVtX2Rl cDsgaSsrKSB7Ci0JCWlmICh0YXNrLT5kZXBbaV0tPmNvbnRleHQgPT0gZmVuY2UtPmNvbnRleHQg JiYKLQkJICAgIGRtYV9mZW5jZV9pc19sYXRlcihmZW5jZSwgdGFzay0+ZGVwW2ldKSkgewotCQkJ ZG1hX2ZlbmNlX3B1dCh0YXNrLT5kZXBbaV0pOwotCQkJdGFzay0+ZGVwW2ldID0gZmVuY2U7Ci0J CQlyZXR1cm4gMDsKLQkJfQotCX0KLQotCXRhc2stPmRlcFt0YXNrLT5udW1fZGVwKytdID0gZmVu Y2U7Ci0JcmV0dXJuIDA7Ci19Ci0KIGludCBsaW1hX3NjaGVkX2NvbnRleHRfaW5pdChzdHJ1Y3Qg bGltYV9zY2hlZF9waXBlICpwaXBlLAogCQkJICAgIHN0cnVjdCBsaW1hX3NjaGVkX2NvbnRleHQg KmNvbnRleHQsCiAJCQkgICAgYXRvbWljX3QgKmd1aWx0eSkKQEAgLTIxMywyMSArMTgzLDkgQEAg c3RhdGljIHN0cnVjdCBkbWFfZmVuY2UgKmxpbWFfc2NoZWRfZGVwZW5kZW5jeShzdHJ1Y3QgZHJt X3NjaGVkX2pvYiAqam9iLAogCQkJCQkgICAgICAgc3RydWN0IGRybV9zY2hlZF9lbnRpdHkgKmVu dGl0eSkKIHsKIAlzdHJ1Y3QgbGltYV9zY2hlZF90YXNrICp0YXNrID0gdG9fbGltYV90YXNrKGpv Yik7Ci0JaW50IGk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgdGFzay0+bnVtX2RlcDsgaSsrKSB7Ci0J CXN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlID0gdGFzay0+ZGVwW2ldOwotCi0JCWlmICghdGFzay0+ ZGVwW2ldKQotCQkJY29udGludWU7Ci0KLQkJdGFzay0+ZGVwW2ldID0gTlVMTDsKIAotCQlpZiAo IWRtYV9mZW5jZV9pc19zaWduYWxlZChmZW5jZSkpCi0JCQlyZXR1cm4gZmVuY2U7Ci0KLQkJZG1h X2ZlbmNlX3B1dChmZW5jZSk7Ci0JfQorCWlmICgheGFfZW1wdHkoJnRhc2stPmRlcHMpKQorCQly ZXR1cm4geGFfZXJhc2UoJnRhc2stPmRlcHMsIHRhc2stPmxhc3RfZGVwKyspOwogCiAJcmV0dXJu IE5VTEw7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbGltYS9saW1hX3NjaGVkLmgg Yi9kcml2ZXJzL2dwdS9kcm0vbGltYS9saW1hX3NjaGVkLmgKaW5kZXggYjAxN2NmYTdlMzI3Li45 MjhhZjkxYzExMTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9saW1hL2xpbWFfc2NoZWQu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vbGltYS9saW1hX3NjaGVkLmgKQEAgLTE0LDkgKzE0LDgg QEAgc3RydWN0IGxpbWFfc2NoZWRfdGFzayB7CiAJc3RydWN0IGxpbWFfdm0gKnZtOwogCXZvaWQg KmZyYW1lOwogCi0Jc3RydWN0IGRtYV9mZW5jZSAqKmRlcDsKLQlpbnQgbnVtX2RlcDsKLQlpbnQg bWF4X2RlcDsKKwlzdHJ1Y3QgeGFycmF5IGRlcHM7CisJdW5zaWduZWQgbG9uZyBsYXN0X2RlcDsK IAogCXN0cnVjdCBsaW1hX2JvICoqYm9zOwogCWludCBudW1fYm9zOwpAQCAtNzgsNyArNzcsNiBA QCBpbnQgbGltYV9zY2hlZF90YXNrX2luaXQoc3RydWN0IGxpbWFfc2NoZWRfdGFzayAqdGFzaywK IAkJCSBzdHJ1Y3QgbGltYV9ibyAqKmJvcywgaW50IG51bV9ib3MsCiAJCQkgc3RydWN0IGxpbWFf dm0gKnZtKTsKIHZvaWQgbGltYV9zY2hlZF90YXNrX2Zpbmkoc3RydWN0IGxpbWFfc2NoZWRfdGFz ayAqdGFzayk7Ci1pbnQgbGltYV9zY2hlZF90YXNrX2FkZF9kZXAoc3RydWN0IGxpbWFfc2NoZWRf dGFzayAqdGFzaywgc3RydWN0IGRtYV9mZW5jZSAqZmVuY2UpOwogCiBpbnQgbGltYV9zY2hlZF9j b250ZXh0X2luaXQoc3RydWN0IGxpbWFfc2NoZWRfcGlwZSAqcGlwZSwKIAkJCSAgICBzdHJ1Y3Qg bGltYV9zY2hlZF9jb250ZXh0ICpjb250ZXh0LAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=