From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunming Zhou Subject: [PATCH 02/10] drm/syncobj: remove drm_syncobj_cb and cleanup Date: Fri, 7 Dec 2018 23:54:14 +0800 Message-ID: <20181207155422.15967-2-david1.zhou@amd.com> References: <20181207155422.15967-1-david1.zhou@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181207155422.15967-1-david1.zhou-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: Christian.Koenig-5C7GfCeVMHo@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= , =?UTF-8?q?Christian=20K=C3=B6nig?= RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2tvZW5pZy5sZWljaHR6dW1lcmtlbkBnbWFpbC5jb20+ CgpUaGlzIGNvbXBsZXRlcyAiZHJtL3N5bmNvYmo6IERyb3AgYWRkL3JlbW92ZV9jYWxsYmFjayBm cm9tIGRyaXZlcgppbnRlcmZhY2UiIGFuZCBjbGVhbnMgdXAgdGhlIGltcGxlbWVudGF0aW9uIGEg Yml0LgoKU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0Bh bWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fc3luY29iai5jIHwgOTEgKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGluY2x1ZGUvZHJtL2RybV9zeW5jb2JqLmggICAg IHwgMjEgLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgODIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9zeW5jb2JqLmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX3N5bmNvYmouYwppbmRleCBkYjMwYTBlODlkYjguLmUxOTUyNWFm MGNjZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9zeW5jb2JqLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2RybV9zeW5jb2JqLmMKQEAgLTU2LDYgKzU2LDE2IEBACiAjaW5jbHVkZSAi ZHJtX2ludGVybmFsLmgiCiAjaW5jbHVkZSA8ZHJtL2RybV9zeW5jb2JqLmg+CiAKK3N0cnVjdCBz eW5jb2JqX3dhaXRfZW50cnkgeworCXN0cnVjdCBsaXN0X2hlYWQgbm9kZTsKKwlzdHJ1Y3QgdGFz a19zdHJ1Y3QgKnRhc2s7CisJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2U7CisJc3RydWN0IGRtYV9m ZW5jZV9jYiBmZW5jZV9jYjsKK307CisKK3N0YXRpYyB2b2lkIHN5bmNvYmpfd2FpdF9zeW5jb2Jq X2Z1bmMoc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLAorCQkJCSAgICAgIHN0cnVjdCBzeW5j b2JqX3dhaXRfZW50cnkgKndhaXQpOworCiAvKioKICAqIGRybV9zeW5jb2JqX2ZpbmQgLSBsb29r dXAgYW5kIHJlZmVyZW5jZSBhIHN5bmMgb2JqZWN0LgogICogQGZpbGVfcHJpdmF0ZTogZHJtIGZp bGUgcHJpdmF0ZSBwb2ludGVyCkBAIC04Miw1OCArOTIsMzMgQEAgc3RydWN0IGRybV9zeW5jb2Jq ICpkcm1fc3luY29ial9maW5kKHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2YXRlLAogfQogRVhQ T1JUX1NZTUJPTChkcm1fc3luY29ial9maW5kKTsKIAotc3RhdGljIHZvaWQgZHJtX3N5bmNvYmpf YWRkX2NhbGxiYWNrX2xvY2tlZChzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCi0JCQkJCSAg ICBzdHJ1Y3QgZHJtX3N5bmNvYmpfY2IgKmNiLAotCQkJCQkgICAgZHJtX3N5bmNvYmpfZnVuY190 IGZ1bmMpCitzdGF0aWMgdm9pZCBkcm1fc3luY29ial9mZW5jZV9hZGRfd2FpdChzdHJ1Y3QgZHJt X3N5bmNvYmogKnN5bmNvYmosCisJCQkJICAgICAgIHN0cnVjdCBzeW5jb2JqX3dhaXRfZW50cnkg KndhaXQpCiB7Ci0JY2ItPmZ1bmMgPSBmdW5jOwotCWxpc3RfYWRkX3RhaWwoJmNiLT5ub2RlLCAm c3luY29iai0+Y2JfbGlzdCk7Ci19Ci0KLXN0YXRpYyBpbnQgZHJtX3N5bmNvYmpfZmVuY2VfZ2V0 X29yX2FkZF9jYWxsYmFjayhzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCi0JCQkJCQkgc3Ry dWN0IGRtYV9mZW5jZSAqKmZlbmNlLAotCQkJCQkJIHN0cnVjdCBkcm1fc3luY29ial9jYiAqY2Is Ci0JCQkJCQkgZHJtX3N5bmNvYmpfZnVuY190IGZ1bmMpCi17Ci0JaW50IHJldDsKLQotCSpmZW5j ZSA9IGRybV9zeW5jb2JqX2ZlbmNlX2dldChzeW5jb2JqKTsKLQlpZiAoKmZlbmNlKQotCQlyZXR1 cm4gMTsKKwlpZiAod2FpdC0+ZmVuY2UpCisJCXJldHVybjsKIAogCXNwaW5fbG9jaygmc3luY29i ai0+bG9jayk7CiAJLyogV2UndmUgYWxyZWFkeSB0cmllZCBvbmNlIHRvIGdldCBhIGZlbmNlIGFu ZCBmYWlsZWQuICBOb3cgdGhhdCB3ZQogCSAqIGhhdmUgdGhlIGxvY2ssIHRyeSBvbmUgbW9yZSB0 aW1lIGp1c3QgdG8gYmUgc3VyZSB3ZSBkb24ndCBhZGQgYQogCSAqIGNhbGxiYWNrIHdoZW4gYSBm ZW5jZSBoYXMgYWxyZWFkeSBiZWVuIHNldC4KIAkgKi8KLQlpZiAoc3luY29iai0+ZmVuY2UpIHsK LQkJKmZlbmNlID0gZG1hX2ZlbmNlX2dldChyY3VfZGVyZWZlcmVuY2VfcHJvdGVjdGVkKHN5bmNv YmotPmZlbmNlLAotCQkJCQkJCQkgbG9ja2RlcF9pc19oZWxkKCZzeW5jb2JqLT5sb2NrKSkpOwot CQlyZXQgPSAxOwotCX0gZWxzZSB7Ci0JCSpmZW5jZSA9IE5VTEw7Ci0JCWRybV9zeW5jb2JqX2Fk ZF9jYWxsYmFja19sb2NrZWQoc3luY29iaiwgY2IsIGZ1bmMpOwotCQlyZXQgPSAwOwotCX0KKwlp ZiAoc3luY29iai0+ZmVuY2UpCisJCXdhaXQtPmZlbmNlID0gZG1hX2ZlbmNlX2dldCgKKwkJCXJj dV9kZXJlZmVyZW5jZV9wcm90ZWN0ZWQoc3luY29iai0+ZmVuY2UsIDEpKTsKKwllbHNlCisJCWxp c3RfYWRkX3RhaWwoJndhaXQtPm5vZGUsICZzeW5jb2JqLT5jYl9saXN0KTsKIAlzcGluX3VubG9j aygmc3luY29iai0+bG9jayk7Ci0KLQlyZXR1cm4gcmV0OwogfQogCi12b2lkIGRybV9zeW5jb2Jq X2FkZF9jYWxsYmFjayhzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCi0JCQkgICAgICBzdHJ1 Y3QgZHJtX3N5bmNvYmpfY2IgKmNiLAotCQkJICAgICAgZHJtX3N5bmNvYmpfZnVuY190IGZ1bmMp CitzdGF0aWMgdm9pZCBkcm1fc3luY29ial9yZW1vdmVfd2FpdChzdHJ1Y3QgZHJtX3N5bmNvYmog KnN5bmNvYmosCisJCQkJICAgIHN0cnVjdCBzeW5jb2JqX3dhaXRfZW50cnkgKndhaXQpCiB7Ci0J c3Bpbl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKLQlkcm1fc3luY29ial9hZGRfY2FsbGJhY2tfbG9j a2VkKHN5bmNvYmosIGNiLCBmdW5jKTsKLQlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7Ci19 CisJaWYgKCF3YWl0LT5ub2RlLm5leHQpCisJCXJldHVybjsKIAotdm9pZCBkcm1fc3luY29ial9y ZW1vdmVfY2FsbGJhY2soc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLAotCQkJCSBzdHJ1Y3Qg ZHJtX3N5bmNvYmpfY2IgKmNiKQotewogCXNwaW5fbG9jaygmc3luY29iai0+bG9jayk7Ci0JbGlz dF9kZWxfaW5pdCgmY2ItPm5vZGUpOworCWxpc3RfZGVsX2luaXQoJndhaXQtPm5vZGUpOwogCXNw aW5fdW5sb2NrKCZzeW5jb2JqLT5sb2NrKTsKIH0KIApAQCAtMTQ4LDcgKzEzMyw3IEBAIHZvaWQg ZHJtX3N5bmNvYmpfcmVwbGFjZV9mZW5jZShzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCiAJ CQkgICAgICAgc3RydWN0IGRtYV9mZW5jZSAqZmVuY2UpCiB7CiAJc3RydWN0IGRtYV9mZW5jZSAq b2xkX2ZlbmNlOwotCXN0cnVjdCBkcm1fc3luY29ial9jYiAqY3VyLCAqdG1wOworCXN0cnVjdCBz eW5jb2JqX3dhaXRfZW50cnkgKmN1ciwgKnRtcDsKIAogCWlmIChmZW5jZSkKIAkJZG1hX2ZlbmNl X2dldChmZW5jZSk7CkBAIC0xNjIsNyArMTQ3LDcgQEAgdm9pZCBkcm1fc3luY29ial9yZXBsYWNl X2ZlbmNlKHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwKIAlpZiAoZmVuY2UgIT0gb2xkX2Zl bmNlKSB7CiAJCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShjdXIsIHRtcCwgJnN5bmNvYmotPmNi X2xpc3QsIG5vZGUpIHsKIAkJCWxpc3RfZGVsX2luaXQoJmN1ci0+bm9kZSk7Ci0JCQljdXItPmZ1 bmMoc3luY29iaiwgY3VyKTsKKwkJCXN5bmNvYmpfd2FpdF9zeW5jb2JqX2Z1bmMoc3luY29iaiwg Y3VyKTsKIAkJfQogCX0KIApAQCAtNjA4LDEzICs1OTMsNiBAQCBkcm1fc3luY29ial9mZF90b19o YW5kbGVfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCQkJJmFy Z3MtPmhhbmRsZSk7CiB9CiAKLXN0cnVjdCBzeW5jb2JqX3dhaXRfZW50cnkgewotCXN0cnVjdCB0 YXNrX3N0cnVjdCAqdGFzazsKLQlzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZTsKLQlzdHJ1Y3QgZG1h X2ZlbmNlX2NiIGZlbmNlX2NiOwotCXN0cnVjdCBkcm1fc3luY29ial9jYiBzeW5jb2JqX2NiOwot fTsKLQogc3RhdGljIHZvaWQgc3luY29ial93YWl0X2ZlbmNlX2Z1bmMoc3RydWN0IGRtYV9mZW5j ZSAqZmVuY2UsCiAJCQkJICAgIHN0cnVjdCBkbWFfZmVuY2VfY2IgKmNiKQogewpAQCAtNjI1LDEx ICs2MDMsOCBAQCBzdGF0aWMgdm9pZCBzeW5jb2JqX3dhaXRfZmVuY2VfZnVuYyhzdHJ1Y3QgZG1h X2ZlbmNlICpmZW5jZSwKIH0KIAogc3RhdGljIHZvaWQgc3luY29ial93YWl0X3N5bmNvYmpfZnVu YyhzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCi0JCQkJICAgICAgc3RydWN0IGRybV9zeW5j b2JqX2NiICpjYikKKwkJCQkgICAgICBzdHJ1Y3Qgc3luY29ial93YWl0X2VudHJ5ICp3YWl0KQog ewotCXN0cnVjdCBzeW5jb2JqX3dhaXRfZW50cnkgKndhaXQgPQotCQljb250YWluZXJfb2YoY2Is IHN0cnVjdCBzeW5jb2JqX3dhaXRfZW50cnksIHN5bmNvYmpfY2IpOwotCiAJLyogVGhpcyBoYXBw ZW5zIGluc2lkZSB0aGUgc3luY29iaiBsb2NrICovCiAJd2FpdC0+ZmVuY2UgPSBkbWFfZmVuY2Vf Z2V0KHJjdV9kZXJlZmVyZW5jZV9wcm90ZWN0ZWQoc3luY29iai0+ZmVuY2UsCiAJCQkJCQkJICAg ICAgbG9ja2RlcF9pc19oZWxkKCZzeW5jb2JqLT5sb2NrKSkpOwpAQCAtNjg4LDEyICs2NjMsOCBA QCBzdGF0aWMgc2lnbmVkIGxvbmcgZHJtX3N5bmNvYmpfYXJyYXlfd2FpdF90aW1lb3V0KHN0cnVj dCBkcm1fc3luY29iaiAqKnN5bmNvYmpzLAogCSAqLwogCiAJaWYgKGZsYWdzICYgRFJNX1NZTkNP QkpfV0FJVF9GTEFHU19XQUlUX0ZPUl9TVUJNSVQpIHsKLQkJZm9yIChpID0gMDsgaSA8IGNvdW50 OyArK2kpIHsKLQkJCWRybV9zeW5jb2JqX2ZlbmNlX2dldF9vcl9hZGRfY2FsbGJhY2soc3luY29i anNbaV0sCi0JCQkJCQkJICAgICAgJmVudHJpZXNbaV0uZmVuY2UsCi0JCQkJCQkJICAgICAgJmVu dHJpZXNbaV0uc3luY29ial9jYiwKLQkJCQkJCQkgICAgICBzeW5jb2JqX3dhaXRfc3luY29ial9m dW5jKTsKLQkJfQorCQlmb3IgKGkgPSAwOyBpIDwgY291bnQ7ICsraSkKKwkJCWRybV9zeW5jb2Jq X2ZlbmNlX2FkZF93YWl0KHN5bmNvYmpzW2ldLCAmZW50cmllc1tpXSk7CiAJfQogCiAJZG8gewpA QCAtNzQyLDkgKzcxMyw3IEBAIHN0YXRpYyBzaWduZWQgbG9uZyBkcm1fc3luY29ial9hcnJheV93 YWl0X3RpbWVvdXQoc3RydWN0IGRybV9zeW5jb2JqICoqc3luY29ianMsCiAKIGNsZWFudXBfZW50 cmllczoKIAlmb3IgKGkgPSAwOyBpIDwgY291bnQ7ICsraSkgewotCQlpZiAoZW50cmllc1tpXS5z eW5jb2JqX2NiLmZ1bmMpCi0JCQlkcm1fc3luY29ial9yZW1vdmVfY2FsbGJhY2soc3luY29ianNb aV0sCi0JCQkJCQkgICAgJmVudHJpZXNbaV0uc3luY29ial9jYik7CisJCWRybV9zeW5jb2JqX3Jl bW92ZV93YWl0KHN5bmNvYmpzW2ldLCAmZW50cmllc1tpXSk7CiAJCWlmIChlbnRyaWVzW2ldLmZl bmNlX2NiLmZ1bmMpCiAJCQlkbWFfZmVuY2VfcmVtb3ZlX2NhbGxiYWNrKGVudHJpZXNbaV0uZmVu Y2UsCiAJCQkJCQkgICZlbnRyaWVzW2ldLmZlbmNlX2NiKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUv ZHJtL2RybV9zeW5jb2JqLmggYi9pbmNsdWRlL2RybS9kcm1fc3luY29iai5oCmluZGV4IGIxZmU5 MjFmOGU4Zi4uN2M2ZWQ4NDVjNzBkIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fc3luY29i ai5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9zeW5jb2JqLmgKQEAgLTI4LDggKzI4LDYgQEAKIAog I2luY2x1ZGUgImxpbnV4L2RtYS1mZW5jZS5oIgogCi1zdHJ1Y3QgZHJtX3N5bmNvYmpfY2I7Ci0K IC8qKgogICogc3RydWN0IGRybV9zeW5jb2JqIC0gc3luYyBvYmplY3QuCiAgKgpAQCAtNjIsMjUg KzYwLDYgQEAgc3RydWN0IGRybV9zeW5jb2JqIHsKIAlzdHJ1Y3QgZmlsZSAqZmlsZTsKIH07CiAK LXR5cGVkZWYgdm9pZCAoKmRybV9zeW5jb2JqX2Z1bmNfdCkoc3RydWN0IGRybV9zeW5jb2JqICpz eW5jb2JqLAotCQkJCSAgIHN0cnVjdCBkcm1fc3luY29ial9jYiAqY2IpOwotCi0vKioKLSAqIHN0 cnVjdCBkcm1fc3luY29ial9jYiAtIGNhbGxiYWNrIGZvciBkcm1fc3luY29ial9hZGRfY2FsbGJh Y2sKLSAqIEBub2RlOiB1c2VkIGJ5IGRybV9zeW5jb2JfYWRkX2NhbGxiYWNrIHRvIGFwcGVuZCB0 aGlzIHN0cnVjdCB0bwotICoJICAmZHJtX3N5bmNvYmouY2JfbGlzdAotICogQGZ1bmM6IGRybV9z eW5jb2JqX2Z1bmNfdCB0byBjYWxsCi0gKgotICogVGhpcyBzdHJ1Y3Qgd2lsbCBiZSBpbml0aWFs aXplZCBieSBkcm1fc3luY29ial9hZGRfY2FsbGJhY2ssIGFkZGl0aW9uYWwKLSAqIGRhdGEgY2Fu IGJlIHBhc3NlZCBhbG9uZyBieSBlbWJlZGRpbmcgZHJtX3N5bmNvYmpfY2IgaW4gYW5vdGhlciBz dHJ1Y3QuCi0gKiBUaGUgY2FsbGJhY2sgd2lsbCBnZXQgY2FsbGVkIHRoZSBuZXh0IHRpbWUgZHJt X3N5bmNvYmpfcmVwbGFjZV9mZW5jZSBpcwotICogY2FsbGVkLgotICovCi1zdHJ1Y3QgZHJtX3N5 bmNvYmpfY2IgewotCXN0cnVjdCBsaXN0X2hlYWQgbm9kZTsKLQlkcm1fc3luY29ial9mdW5jX3Qg ZnVuYzsKLX07Ci0KIHZvaWQgZHJtX3N5bmNvYmpfZnJlZShzdHJ1Y3Qga3JlZiAqa3JlZik7CiAK IC8qKgotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK