From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Christian_K=c3=b6nig?= Subject: Re: [PATCH 04/10] drm/syncobj: remove drm_syncobj_cb and cleanup Date: Wed, 5 Dec 2018 11:00:33 +0100 Message-ID: References: <20181204115948.15202-1-christian.koenig@amd.com> <20181204115948.15202-4-christian.koenig@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181204115948.15202-4-christian.koenig@amd.com> Content-Language: en-US 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, amd-gfx@lists.freedesktop.org, Daniel Vetter List-Id: amd-gfx.lists.freedesktop.org SGkgRGFuaWVsLAoKY2FuIEkgZ2V0IGEgcmV2aWV3IGZvciB0aGlzIG9uZT8gSXQgaXMgZXNzZW50 aWFsbHkganVzdCBhIGZvbGxvdyB1cCAKY2xlYW51cCBvbiBvbmUgb2YgeW91ciBwYXRjaGVzIGFu ZCBzaG91bGRuJ3QgaGF2ZSBhbnkgZnVuY3Rpb25hbCBlZmZlY3QuCgpUaGFua3MsCkNocmlzdGlh bi4KCkFtIDA0LjEyLjE4IHVtIDEyOjU5IHNjaHJpZWIgQ2hyaXN0aWFuIEvDtm5pZzoKPiBUaGlz IGNvbXBsZXRlcyAiZHJtL3N5bmNvYmo6IERyb3AgYWRkL3JlbW92ZV9jYWxsYmFjayBmcm9tIGRy aXZlcgo+IGludGVyZmFjZSIgYW5kIGNsZWFucyB1cCB0aGUgaW1wbGVtZW50YXRpb24gYSBiaXQu Cj4KPiBTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFt ZC5jb20+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vZHJtX3N5bmNvYmouYyB8IDkxICsrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgIGluY2x1ZGUvZHJtL2Ry bV9zeW5jb2JqLmggICAgIHwgMjEgLS0tLS0tLS0tLQo+ICAgMiBmaWxlcyBjaGFuZ2VkLCAzMCBp bnNlcnRpb25zKCspLCA4MiBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vZHJtX3N5bmNvYmouYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fc3luY29iai5jCj4gaW5k ZXggZGIzMGEwZTg5ZGI4Li5lMTk1MjVhZjBjY2UgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2RybV9zeW5jb2JqLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3N5bmNvYmouYwo+ IEBAIC01Niw2ICs1NiwxNiBAQAo+ICAgI2luY2x1ZGUgImRybV9pbnRlcm5hbC5oIgo+ICAgI2lu Y2x1ZGUgPGRybS9kcm1fc3luY29iai5oPgo+ICAgCj4gK3N0cnVjdCBzeW5jb2JqX3dhaXRfZW50 cnkgewo+ICsJc3RydWN0IGxpc3RfaGVhZCBub2RlOwo+ICsJc3RydWN0IHRhc2tfc3RydWN0ICp0 YXNrOwo+ICsJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2U7Cj4gKwlzdHJ1Y3QgZG1hX2ZlbmNlX2Ni IGZlbmNlX2NiOwo+ICt9Owo+ICsKPiArc3RhdGljIHZvaWQgc3luY29ial93YWl0X3N5bmNvYmpf ZnVuYyhzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCj4gKwkJCQkgICAgICBzdHJ1Y3Qgc3lu Y29ial93YWl0X2VudHJ5ICp3YWl0KTsKPiArCj4gICAvKioKPiAgICAqIGRybV9zeW5jb2JqX2Zp bmQgLSBsb29rdXAgYW5kIHJlZmVyZW5jZSBhIHN5bmMgb2JqZWN0Lgo+ICAgICogQGZpbGVfcHJp dmF0ZTogZHJtIGZpbGUgcHJpdmF0ZSBwb2ludGVyCj4gQEAgLTgyLDU4ICs5MiwzMyBAQCBzdHJ1 Y3QgZHJtX3N5bmNvYmogKmRybV9zeW5jb2JqX2ZpbmQoc3RydWN0IGRybV9maWxlICpmaWxlX3By aXZhdGUsCj4gICB9Cj4gICBFWFBPUlRfU1lNQk9MKGRybV9zeW5jb2JqX2ZpbmQpOwo+ICAgCj4g LXN0YXRpYyB2b2lkIGRybV9zeW5jb2JqX2FkZF9jYWxsYmFja19sb2NrZWQoc3RydWN0IGRybV9z eW5jb2JqICpzeW5jb2JqLAo+IC0JCQkJCSAgICBzdHJ1Y3QgZHJtX3N5bmNvYmpfY2IgKmNiLAo+ IC0JCQkJCSAgICBkcm1fc3luY29ial9mdW5jX3QgZnVuYykKPiArc3RhdGljIHZvaWQgZHJtX3N5 bmNvYmpfZmVuY2VfYWRkX3dhaXQoc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLAo+ICsJCQkJ ICAgICAgIHN0cnVjdCBzeW5jb2JqX3dhaXRfZW50cnkgKndhaXQpCj4gICB7Cj4gLQljYi0+ZnVu YyA9IGZ1bmM7Cj4gLQlsaXN0X2FkZF90YWlsKCZjYi0+bm9kZSwgJnN5bmNvYmotPmNiX2xpc3Qp Owo+IC19Cj4gLQo+IC1zdGF0aWMgaW50IGRybV9zeW5jb2JqX2ZlbmNlX2dldF9vcl9hZGRfY2Fs bGJhY2soc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLAo+IC0JCQkJCQkgc3RydWN0IGRtYV9m ZW5jZSAqKmZlbmNlLAo+IC0JCQkJCQkgc3RydWN0IGRybV9zeW5jb2JqX2NiICpjYiwKPiAtCQkJ CQkJIGRybV9zeW5jb2JqX2Z1bmNfdCBmdW5jKQo+IC17Cj4gLQlpbnQgcmV0Owo+IC0KPiAtCSpm ZW5jZSA9IGRybV9zeW5jb2JqX2ZlbmNlX2dldChzeW5jb2JqKTsKPiAtCWlmICgqZmVuY2UpCj4g LQkJcmV0dXJuIDE7Cj4gKwlpZiAod2FpdC0+ZmVuY2UpCj4gKwkJcmV0dXJuOwo+ICAgCj4gICAJ c3Bpbl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKPiAgIAkvKiBXZSd2ZSBhbHJlYWR5IHRyaWVkIG9u Y2UgdG8gZ2V0IGEgZmVuY2UgYW5kIGZhaWxlZC4gIE5vdyB0aGF0IHdlCj4gICAJICogaGF2ZSB0 aGUgbG9jaywgdHJ5IG9uZSBtb3JlIHRpbWUganVzdCB0byBiZSBzdXJlIHdlIGRvbid0IGFkZCBh Cj4gICAJICogY2FsbGJhY2sgd2hlbiBhIGZlbmNlIGhhcyBhbHJlYWR5IGJlZW4gc2V0Lgo+ICAg CSAqLwo+IC0JaWYgKHN5bmNvYmotPmZlbmNlKSB7Cj4gLQkJKmZlbmNlID0gZG1hX2ZlbmNlX2dl dChyY3VfZGVyZWZlcmVuY2VfcHJvdGVjdGVkKHN5bmNvYmotPmZlbmNlLAo+IC0JCQkJCQkJCSBs b2NrZGVwX2lzX2hlbGQoJnN5bmNvYmotPmxvY2spKSk7Cj4gLQkJcmV0ID0gMTsKPiAtCX0gZWxz ZSB7Cj4gLQkJKmZlbmNlID0gTlVMTDsKPiAtCQlkcm1fc3luY29ial9hZGRfY2FsbGJhY2tfbG9j a2VkKHN5bmNvYmosIGNiLCBmdW5jKTsKPiAtCQlyZXQgPSAwOwo+IC0JfQo+ICsJaWYgKHN5bmNv YmotPmZlbmNlKQo+ICsJCXdhaXQtPmZlbmNlID0gZG1hX2ZlbmNlX2dldCgKPiArCQkJcmN1X2Rl cmVmZXJlbmNlX3Byb3RlY3RlZChzeW5jb2JqLT5mZW5jZSwgMSkpOwo+ICsJZWxzZQo+ICsJCWxp c3RfYWRkX3RhaWwoJndhaXQtPm5vZGUsICZzeW5jb2JqLT5jYl9saXN0KTsKPiAgIAlzcGluX3Vu bG9jaygmc3luY29iai0+bG9jayk7Cj4gLQo+IC0JcmV0dXJuIHJldDsKPiAgIH0KPiAgIAo+IC12 b2lkIGRybV9zeW5jb2JqX2FkZF9jYWxsYmFjayhzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmos Cj4gLQkJCSAgICAgIHN0cnVjdCBkcm1fc3luY29ial9jYiAqY2IsCj4gLQkJCSAgICAgIGRybV9z eW5jb2JqX2Z1bmNfdCBmdW5jKQo+ICtzdGF0aWMgdm9pZCBkcm1fc3luY29ial9yZW1vdmVfd2Fp dChzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCj4gKwkJCQkgICAgc3RydWN0IHN5bmNvYmpf d2FpdF9lbnRyeSAqd2FpdCkKPiAgIHsKPiAtCXNwaW5fbG9jaygmc3luY29iai0+bG9jayk7Cj4g LQlkcm1fc3luY29ial9hZGRfY2FsbGJhY2tfbG9ja2VkKHN5bmNvYmosIGNiLCBmdW5jKTsKPiAt CXNwaW5fdW5sb2NrKCZzeW5jb2JqLT5sb2NrKTsKPiAtfQo+ICsJaWYgKCF3YWl0LT5ub2RlLm5l eHQpCj4gKwkJcmV0dXJuOwo+ICAgCj4gLXZvaWQgZHJtX3N5bmNvYmpfcmVtb3ZlX2NhbGxiYWNr KHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwKPiAtCQkJCSBzdHJ1Y3QgZHJtX3N5bmNvYmpf Y2IgKmNiKQo+IC17Cj4gICAJc3Bpbl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKPiAtCWxpc3RfZGVs X2luaXQoJmNiLT5ub2RlKTsKPiArCWxpc3RfZGVsX2luaXQoJndhaXQtPm5vZGUpOwo+ICAgCXNw aW5fdW5sb2NrKCZzeW5jb2JqLT5sb2NrKTsKPiAgIH0KPiAgIAo+IEBAIC0xNDgsNyArMTMzLDcg QEAgdm9pZCBkcm1fc3luY29ial9yZXBsYWNlX2ZlbmNlKHN0cnVjdCBkcm1fc3luY29iaiAqc3lu Y29iaiwKPiAgIAkJCSAgICAgICBzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSkKPiAgIHsKPiAgIAlz dHJ1Y3QgZG1hX2ZlbmNlICpvbGRfZmVuY2U7Cj4gLQlzdHJ1Y3QgZHJtX3N5bmNvYmpfY2IgKmN1 ciwgKnRtcDsKPiArCXN0cnVjdCBzeW5jb2JqX3dhaXRfZW50cnkgKmN1ciwgKnRtcDsKPiAgIAo+ ICAgCWlmIChmZW5jZSkKPiAgIAkJZG1hX2ZlbmNlX2dldChmZW5jZSk7Cj4gQEAgLTE2Miw3ICsx NDcsNyBAQCB2b2lkIGRybV9zeW5jb2JqX3JlcGxhY2VfZmVuY2Uoc3RydWN0IGRybV9zeW5jb2Jq ICpzeW5jb2JqLAo+ICAgCWlmIChmZW5jZSAhPSBvbGRfZmVuY2UpIHsKPiAgIAkJbGlzdF9mb3Jf ZWFjaF9lbnRyeV9zYWZlKGN1ciwgdG1wLCAmc3luY29iai0+Y2JfbGlzdCwgbm9kZSkgewo+ICAg CQkJbGlzdF9kZWxfaW5pdCgmY3VyLT5ub2RlKTsKPiAtCQkJY3VyLT5mdW5jKHN5bmNvYmosIGN1 cik7Cj4gKwkJCXN5bmNvYmpfd2FpdF9zeW5jb2JqX2Z1bmMoc3luY29iaiwgY3VyKTsKPiAgIAkJ fQo+ICAgCX0KPiAgIAo+IEBAIC02MDgsMTMgKzU5Myw2IEBAIGRybV9zeW5jb2JqX2ZkX3RvX2hh bmRsZV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAo+ICAgCQkJCQkm YXJncy0+aGFuZGxlKTsKPiAgIH0KPiAgIAo+IC1zdHJ1Y3Qgc3luY29ial93YWl0X2VudHJ5IHsK PiAtCXN0cnVjdCB0YXNrX3N0cnVjdCAqdGFzazsKPiAtCXN0cnVjdCBkbWFfZmVuY2UgKmZlbmNl Owo+IC0Jc3RydWN0IGRtYV9mZW5jZV9jYiBmZW5jZV9jYjsKPiAtCXN0cnVjdCBkcm1fc3luY29i al9jYiBzeW5jb2JqX2NiOwo+IC19Owo+IC0KPiAgIHN0YXRpYyB2b2lkIHN5bmNvYmpfd2FpdF9m ZW5jZV9mdW5jKHN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlLAo+ICAgCQkJCSAgICBzdHJ1Y3QgZG1h X2ZlbmNlX2NiICpjYikKPiAgIHsKPiBAQCAtNjI1LDExICs2MDMsOCBAQCBzdGF0aWMgdm9pZCBz eW5jb2JqX3dhaXRfZmVuY2VfZnVuYyhzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSwKPiAgIH0KPiAg IAo+ICAgc3RhdGljIHZvaWQgc3luY29ial93YWl0X3N5bmNvYmpfZnVuYyhzdHJ1Y3QgZHJtX3N5 bmNvYmogKnN5bmNvYmosCj4gLQkJCQkgICAgICBzdHJ1Y3QgZHJtX3N5bmNvYmpfY2IgKmNiKQo+ ICsJCQkJICAgICAgc3RydWN0IHN5bmNvYmpfd2FpdF9lbnRyeSAqd2FpdCkKPiAgIHsKPiAtCXN0 cnVjdCBzeW5jb2JqX3dhaXRfZW50cnkgKndhaXQgPQo+IC0JCWNvbnRhaW5lcl9vZihjYiwgc3Ry dWN0IHN5bmNvYmpfd2FpdF9lbnRyeSwgc3luY29ial9jYik7Cj4gLQo+ICAgCS8qIFRoaXMgaGFw cGVucyBpbnNpZGUgdGhlIHN5bmNvYmogbG9jayAqLwo+ICAgCXdhaXQtPmZlbmNlID0gZG1hX2Zl bmNlX2dldChyY3VfZGVyZWZlcmVuY2VfcHJvdGVjdGVkKHN5bmNvYmotPmZlbmNlLAo+ICAgCQkJ CQkJCSAgICAgIGxvY2tkZXBfaXNfaGVsZCgmc3luY29iai0+bG9jaykpKTsKPiBAQCAtNjg4LDEy ICs2NjMsOCBAQCBzdGF0aWMgc2lnbmVkIGxvbmcgZHJtX3N5bmNvYmpfYXJyYXlfd2FpdF90aW1l b3V0KHN0cnVjdCBkcm1fc3luY29iaiAqKnN5bmNvYmpzLAo+ICAgCSAqLwo+ICAgCj4gICAJaWYg KGZsYWdzICYgRFJNX1NZTkNPQkpfV0FJVF9GTEFHU19XQUlUX0ZPUl9TVUJNSVQpIHsKPiAtCQlm b3IgKGkgPSAwOyBpIDwgY291bnQ7ICsraSkgewo+IC0JCQlkcm1fc3luY29ial9mZW5jZV9nZXRf b3JfYWRkX2NhbGxiYWNrKHN5bmNvYmpzW2ldLAo+IC0JCQkJCQkJICAgICAgJmVudHJpZXNbaV0u ZmVuY2UsCj4gLQkJCQkJCQkgICAgICAmZW50cmllc1tpXS5zeW5jb2JqX2NiLAo+IC0JCQkJCQkJ ICAgICAgc3luY29ial93YWl0X3N5bmNvYmpfZnVuYyk7Cj4gLQkJfQo+ICsJCWZvciAoaSA9IDA7 IGkgPCBjb3VudDsgKytpKQo+ICsJCQlkcm1fc3luY29ial9mZW5jZV9hZGRfd2FpdChzeW5jb2Jq c1tpXSwgJmVudHJpZXNbaV0pOwo+ICAgCX0KPiAgIAo+ICAgCWRvIHsKPiBAQCAtNzQyLDkgKzcx Myw3IEBAIHN0YXRpYyBzaWduZWQgbG9uZyBkcm1fc3luY29ial9hcnJheV93YWl0X3RpbWVvdXQo c3RydWN0IGRybV9zeW5jb2JqICoqc3luY29ianMsCj4gICAKPiAgIGNsZWFudXBfZW50cmllczoK PiAgIAlmb3IgKGkgPSAwOyBpIDwgY291bnQ7ICsraSkgewo+IC0JCWlmIChlbnRyaWVzW2ldLnN5 bmNvYmpfY2IuZnVuYykKPiAtCQkJZHJtX3N5bmNvYmpfcmVtb3ZlX2NhbGxiYWNrKHN5bmNvYmpz W2ldLAo+IC0JCQkJCQkgICAgJmVudHJpZXNbaV0uc3luY29ial9jYik7Cj4gKwkJZHJtX3N5bmNv YmpfcmVtb3ZlX3dhaXQoc3luY29ianNbaV0sICZlbnRyaWVzW2ldKTsKPiAgIAkJaWYgKGVudHJp ZXNbaV0uZmVuY2VfY2IuZnVuYykKPiAgIAkJCWRtYV9mZW5jZV9yZW1vdmVfY2FsbGJhY2soZW50 cmllc1tpXS5mZW5jZSwKPiAgIAkJCQkJCSAgJmVudHJpZXNbaV0uZmVuY2VfY2IpOwo+IGRpZmYg LS1naXQgYS9pbmNsdWRlL2RybS9kcm1fc3luY29iai5oIGIvaW5jbHVkZS9kcm0vZHJtX3N5bmNv YmouaAo+IGluZGV4IGIxZmU5MjFmOGU4Zi4uN2M2ZWQ4NDVjNzBkIDEwMDY0NAo+IC0tLSBhL2lu Y2x1ZGUvZHJtL2RybV9zeW5jb2JqLmgKPiArKysgYi9pbmNsdWRlL2RybS9kcm1fc3luY29iai5o Cj4gQEAgLTI4LDggKzI4LDYgQEAKPiAgIAo+ICAgI2luY2x1ZGUgImxpbnV4L2RtYS1mZW5jZS5o Igo+ICAgCj4gLXN0cnVjdCBkcm1fc3luY29ial9jYjsKPiAtCj4gICAvKioKPiAgICAqIHN0cnVj dCBkcm1fc3luY29iaiAtIHN5bmMgb2JqZWN0Lgo+ICAgICoKPiBAQCAtNjIsMjUgKzYwLDYgQEAg c3RydWN0IGRybV9zeW5jb2JqIHsKPiAgIAlzdHJ1Y3QgZmlsZSAqZmlsZTsKPiAgIH07Cj4gICAK PiAtdHlwZWRlZiB2b2lkICgqZHJtX3N5bmNvYmpfZnVuY190KShzdHJ1Y3QgZHJtX3N5bmNvYmog KnN5bmNvYmosCj4gLQkJCQkgICBzdHJ1Y3QgZHJtX3N5bmNvYmpfY2IgKmNiKTsKPiAtCj4gLS8q Kgo+IC0gKiBzdHJ1Y3QgZHJtX3N5bmNvYmpfY2IgLSBjYWxsYmFjayBmb3IgZHJtX3N5bmNvYmpf YWRkX2NhbGxiYWNrCj4gLSAqIEBub2RlOiB1c2VkIGJ5IGRybV9zeW5jb2JfYWRkX2NhbGxiYWNr IHRvIGFwcGVuZCB0aGlzIHN0cnVjdCB0bwo+IC0gKgkgICZkcm1fc3luY29iai5jYl9saXN0Cj4g LSAqIEBmdW5jOiBkcm1fc3luY29ial9mdW5jX3QgdG8gY2FsbAo+IC0gKgo+IC0gKiBUaGlzIHN0 cnVjdCB3aWxsIGJlIGluaXRpYWxpemVkIGJ5IGRybV9zeW5jb2JqX2FkZF9jYWxsYmFjaywgYWRk aXRpb25hbAo+IC0gKiBkYXRhIGNhbiBiZSBwYXNzZWQgYWxvbmcgYnkgZW1iZWRkaW5nIGRybV9z eW5jb2JqX2NiIGluIGFub3RoZXIgc3RydWN0Lgo+IC0gKiBUaGUgY2FsbGJhY2sgd2lsbCBnZXQg Y2FsbGVkIHRoZSBuZXh0IHRpbWUgZHJtX3N5bmNvYmpfcmVwbGFjZV9mZW5jZSBpcwo+IC0gKiBj YWxsZWQuCj4gLSAqLwo+IC1zdHJ1Y3QgZHJtX3N5bmNvYmpfY2Igewo+IC0Jc3RydWN0IGxpc3Rf aGVhZCBub2RlOwo+IC0JZHJtX3N5bmNvYmpfZnVuY190IGZ1bmM7Cj4gLX07Cj4gLQo+ICAgdm9p ZCBkcm1fc3luY29ial9mcmVlKHN0cnVjdCBrcmVmICprcmVmKTsKPiAgIAo+ICAgLyoqCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK