From: Chunming Zhou Subject: [PATCH 8/8] drm: clean up syncobj->fence and cb Date: Fri, 24 Aug 2018 20:12:10 +0800 Message-ID: <20180824121210.19101-8-david1.zhou@amd.com> References: <20180824121210.19101-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: <20180824121210.19101-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: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Chunming Zhou , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org c3luY29iaiBmZW5jZSBhbmQgY2IgYXJlbid0IG5lZWQgYW55IG1vcmUuCndhaXQgcHQgYWxyZWFk eSBjb250YWlucyBzdW1pc3Npb24gd2FpdC4KClNpZ25lZC1vZmYtYnk6IENodW5taW5nIFpob3Ug PGRhdmlkMS56aG91QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9zeW5jb2JqLmMg fCA2OSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9kcm0vZHJt X3N5bmNvYmouaCAgICAgfCA1NiArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVz IGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2RybV9zeW5jb2JqLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3N5bmNv YmouYwppbmRleCAwYmU3ZGQwYTBlN2QuLmNkMzU4Y2YzY2JlYiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2RybV9zeW5jb2JqLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9zeW5jb2Jq LmMKQEAgLTEyMyw2MSArMTIzLDYgQEAgc3RydWN0IGRybV9zeW5jb2JqICpkcm1fc3luY29ial9m aW5kKHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2YXRlLAogfQogRVhQT1JUX1NZTUJPTChkcm1f c3luY29ial9maW5kKTsKIAotc3RhdGljIHZvaWQgZHJtX3N5bmNvYmpfYWRkX2NhbGxiYWNrX2xv Y2tlZChzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCi0JCQkJCSAgICBzdHJ1Y3QgZHJtX3N5 bmNvYmpfY2IgKmNiLAotCQkJCQkgICAgZHJtX3N5bmNvYmpfZnVuY190IGZ1bmMpCi17Ci0JY2It PmZ1bmMgPSBmdW5jOwotCWxpc3RfYWRkX3RhaWwoJmNiLT5ub2RlLCAmc3luY29iai0+Y2JfbGlz dCk7Ci19Ci0KLXN0YXRpYyBpbnQgZHJtX3N5bmNvYmpfZmVuY2VfZ2V0X29yX2FkZF9jYWxsYmFj ayhzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosCi0JCQkJCQkgc3RydWN0IGRtYV9mZW5jZSAq KmZlbmNlLAotCQkJCQkJIHN0cnVjdCBkcm1fc3luY29ial9jYiAqY2IsCi0JCQkJCQkgZHJtX3N5 bmNvYmpfZnVuY190IGZ1bmMpCi17Ci0JaW50IHJldDsKLQotCSpmZW5jZSA9IGRybV9zeW5jb2Jq X2ZlbmNlX2dldChzeW5jb2JqKTsKLQlpZiAoKmZlbmNlKQotCQlyZXR1cm4gMTsKLQotCXNwaW5f bG9jaygmc3luY29iai0+bG9jayk7Ci0JLyogV2UndmUgYWxyZWFkeSB0cmllZCBvbmNlIHRvIGdl dCBhIGZlbmNlIGFuZCBmYWlsZWQuICBOb3cgdGhhdCB3ZQotCSAqIGhhdmUgdGhlIGxvY2ssIHRy eSBvbmUgbW9yZSB0aW1lIGp1c3QgdG8gYmUgc3VyZSB3ZSBkb24ndCBhZGQgYQotCSAqIGNhbGxi YWNrIHdoZW4gYSBmZW5jZSBoYXMgYWxyZWFkeSBiZWVuIHNldC4KLQkgKi8KLQlpZiAoc3luY29i ai0+ZmVuY2UpIHsKLQkJKmZlbmNlID0gZG1hX2ZlbmNlX2dldChyY3VfZGVyZWZlcmVuY2VfcHJv dGVjdGVkKHN5bmNvYmotPmZlbmNlLAotCQkJCQkJCQkgbG9ja2RlcF9pc19oZWxkKCZzeW5jb2Jq LT5sb2NrKSkpOwotCQlyZXQgPSAxOwotCX0gZWxzZSB7Ci0JCSpmZW5jZSA9IE5VTEw7Ci0JCWRy bV9zeW5jb2JqX2FkZF9jYWxsYmFja19sb2NrZWQoc3luY29iaiwgY2IsIGZ1bmMpOwotCQlyZXQg PSAwOwotCX0KLQlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7Ci0KLQlyZXR1cm4gcmV0Owot fQotCi12b2lkIGRybV9zeW5jb2JqX2FkZF9jYWxsYmFjayhzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5 bmNvYmosCi0JCQkgICAgICBzdHJ1Y3QgZHJtX3N5bmNvYmpfY2IgKmNiLAotCQkJICAgICAgZHJt X3N5bmNvYmpfZnVuY190IGZ1bmMpCi17Ci0Jc3Bpbl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKLQlk cm1fc3luY29ial9hZGRfY2FsbGJhY2tfbG9ja2VkKHN5bmNvYmosIGNiLCBmdW5jKTsKLQlzcGlu X3VubG9jaygmc3luY29iai0+bG9jayk7Ci19Ci0KLXZvaWQgZHJtX3N5bmNvYmpfcmVtb3ZlX2Nh bGxiYWNrKHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwKLQkJCQkgc3RydWN0IGRybV9zeW5j b2JqX2NiICpjYikKLXsKLQlzcGluX2xvY2soJnN5bmNvYmotPmxvY2spOwotCWxpc3RfZGVsX2lu aXQoJmNiLT5ub2RlKTsKLQlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7Ci19Ci0KIHN0YXRp YyB2b2lkIGRybV9zeW5jb2JqX3RpbWVsaW5lX3NpZ25hbF93YWl0X3B0cyhzdHJ1Y3QgZHJtX3N5 bmNvYmogKnN5bmNvYmopCiB7CiAJc3RydWN0IHJiX25vZGUgKm5vZGUgPSBOVUxMOwpAQCAtNjIx LDcgKzU2Niw2IEBAIGludCBkcm1fc3luY29ial9jcmVhdGUoc3RydWN0IGRybV9zeW5jb2JqICoq b3V0X3N5bmNvYmosIHVpbnQzMl90IGZsYWdzLAogCQlyZXR1cm4gLUVOT01FTTsKIAogCWtyZWZf aW5pdCgmc3luY29iai0+cmVmY291bnQpOwotCUlOSVRfTElTVF9IRUFEKCZzeW5jb2JqLT5jYl9s aXN0KTsKIAlzcGluX2xvY2tfaW5pdCgmc3luY29iai0+bG9jayk7CiAJaWYgKGZsYWdzICYgRFJN X1NZTkNPQkpfQ1JFQVRFX1RZUEVfVElNRUxJTkUpIHsKIAkJc3luY29iai0+dHlwZSA9IERSTV9T WU5DT0JKX1RZUEVfVElNRUxJTkU7CkBAIC05ODYsNyArOTMwLDYgQEAgc3RydWN0IHN5bmNvYmpf d2FpdF9lbnRyeSB7CiAJc3RydWN0IHRhc2tfc3RydWN0ICp0YXNrOwogCXN0cnVjdCBkbWFfZmVu Y2UgKmZlbmNlOwogCXN0cnVjdCBkbWFfZmVuY2VfY2IgZmVuY2VfY2I7Ci0Jc3RydWN0IGRybV9z eW5jb2JqX2NiIHN5bmNvYmpfY2I7CiB9OwogCiBzdGF0aWMgdm9pZCBzeW5jb2JqX3dhaXRfZmVu Y2VfZnVuYyhzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSwKQEAgLTk5OCwxOCArOTQxLDYgQEAgc3Rh dGljIHZvaWQgc3luY29ial93YWl0X2ZlbmNlX2Z1bmMoc3RydWN0IGRtYV9mZW5jZSAqZmVuY2Us CiAJd2FrZV91cF9wcm9jZXNzKHdhaXQtPnRhc2spOwogfQogCi1zdGF0aWMgdm9pZCBzeW5jb2Jq X3dhaXRfc3luY29ial9mdW5jKHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwKLQkJCQkgICAg ICBzdHJ1Y3QgZHJtX3N5bmNvYmpfY2IgKmNiKQotewotCXN0cnVjdCBzeW5jb2JqX3dhaXRfZW50 cnkgKndhaXQgPQotCQljb250YWluZXJfb2YoY2IsIHN0cnVjdCBzeW5jb2JqX3dhaXRfZW50cnks IHN5bmNvYmpfY2IpOwotCi0JLyogVGhpcyBoYXBwZW5zIGluc2lkZSB0aGUgc3luY29iaiBsb2Nr ICovCi0Jd2FpdC0+ZmVuY2UgPSBkbWFfZmVuY2VfZ2V0KHJjdV9kZXJlZmVyZW5jZV9wcm90ZWN0 ZWQoc3luY29iai0+ZmVuY2UsCi0JCQkJCQkJICAgICAgbG9ja2RlcF9pc19oZWxkKCZzeW5jb2Jq LT5sb2NrKSkpOwotCXdha2VfdXBfcHJvY2Vzcyh3YWl0LT50YXNrKTsKLX0KLQogc3RhdGljIHNp Z25lZCBsb25nIGRybV9zeW5jb2JqX2FycmF5X3dhaXRfdGltZW91dChzdHJ1Y3QgZHJtX3N5bmNv YmogKipzeW5jb2JqcywKIAkJCQkJCSAgdWludDMyX3QgY291bnQsCiAJCQkJCQkgIHVpbnQzMl90 IGZsYWdzLApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX3N5bmNvYmouaCBiL2luY2x1ZGUv ZHJtL2RybV9zeW5jb2JqLmgKaW5kZXggZWMwOThkNDc5OGI4Li42NTdjOTdkYzI1ZWMgMTAwNjQ0 Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9zeW5jb2JqLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX3N5 bmNvYmouaApAQCAtNjksMTkgKzY5LDcgQEAgc3RydWN0IGRybV9zeW5jb2JqIHsKIAlzdHJ1Y3Qg ZHJtX3N5bmNvYmpfdGltZWxpbmUgc3luY29ial90aW1lbGluZTsKIAogCS8qKgotCSAqIEBmZW5j ZToKLQkgKiBOVUxMIG9yIGEgcG9pbnRlciB0byB0aGUgZmVuY2UgYm91bmQgdG8gdGhpcyBvYmpl Y3QuCi0JICoKLQkgKiBUaGlzIGZpZWxkIHNob3VsZCBub3QgYmUgdXNlZCBkaXJlY3RseS4gVXNl IGRybV9zeW5jb2JqX2ZlbmNlX2dldCgpCi0JICogYW5kIGRybV9zeW5jb2JqX3JlcGxhY2VfZmVu Y2UoKSBpbnN0ZWFkLgotCSAqLwotCXN0cnVjdCBkbWFfZmVuY2UgX19yY3UgKmZlbmNlOwotCS8q KgotCSAqIEBjYl9saXN0OiBMaXN0IG9mIGNhbGxiYWNrcyB0byBjYWxsIHdoZW4gdGhlICZmZW5j ZSBnZXRzIHJlcGxhY2VkLgotCSAqLwotCXN0cnVjdCBsaXN0X2hlYWQgY2JfbGlzdDsKLQkvKioK LQkgKiBAbG9jazogUHJvdGVjdHMgJmNiX2xpc3QgYW5kIHdyaXRlLWxvY2tzICZmZW5jZS4KKwkg KiBAbG9jazogUHJvdGVjdHMgdGltZWxpbmUgbGlzdCBhbmQgd3JpdGUtbG9ja3MgJmZlbmNlLgog CSAqLwogCXNwaW5sb2NrX3QgbG9jazsKIAkvKioKQEAgLTkwLDI1ICs3OCw2IEBAIHN0cnVjdCBk cm1fc3luY29iaiB7CiAJc3RydWN0IGZpbGUgKmZpbGU7CiB9OwogCi10eXBlZGVmIHZvaWQgKCpk cm1fc3luY29ial9mdW5jX3QpKHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwKLQkJCQkgICBz dHJ1Y3QgZHJtX3N5bmNvYmpfY2IgKmNiKTsKLQotLyoqCi0gKiBzdHJ1Y3QgZHJtX3N5bmNvYmpf Y2IgLSBjYWxsYmFjayBmb3IgZHJtX3N5bmNvYmpfYWRkX2NhbGxiYWNrCi0gKiBAbm9kZTogdXNl ZCBieSBkcm1fc3luY29iX2FkZF9jYWxsYmFjayB0byBhcHBlbmQgdGhpcyBzdHJ1Y3QgdG8KLSAq CSAgJmRybV9zeW5jb2JqLmNiX2xpc3QKLSAqIEBmdW5jOiBkcm1fc3luY29ial9mdW5jX3QgdG8g Y2FsbAotICoKLSAqIFRoaXMgc3RydWN0IHdpbGwgYmUgaW5pdGlhbGl6ZWQgYnkgZHJtX3N5bmNv YmpfYWRkX2NhbGxiYWNrLCBhZGRpdGlvbmFsCi0gKiBkYXRhIGNhbiBiZSBwYXNzZWQgYWxvbmcg YnkgZW1iZWRkaW5nIGRybV9zeW5jb2JqX2NiIGluIGFub3RoZXIgc3RydWN0LgotICogVGhlIGNh bGxiYWNrIHdpbGwgZ2V0IGNhbGxlZCB0aGUgbmV4dCB0aW1lIGRybV9zeW5jb2JqX3JlcGxhY2Vf ZmVuY2UgaXMKLSAqIGNhbGxlZC4KLSAqLwotc3RydWN0IGRybV9zeW5jb2JqX2NiIHsKLQlzdHJ1 Y3QgbGlzdF9oZWFkIG5vZGU7Ci0JZHJtX3N5bmNvYmpfZnVuY190IGZ1bmM7Ci19OwotCiB2b2lk IGRybV9zeW5jb2JqX2ZyZWUoc3RydWN0IGtyZWYgKmtyZWYpOwogCiAvKioKQEAgLTEzNCwyOSAr MTAzLDYgQEAgZHJtX3N5bmNvYmpfcHV0KHN0cnVjdCBkcm1fc3luY29iaiAqb2JqKQogCWtyZWZf cHV0KCZvYmotPnJlZmNvdW50LCBkcm1fc3luY29ial9mcmVlKTsKIH0KIAotLyoqCi0gKiBkcm1f c3luY29ial9mZW5jZV9nZXQgLSBnZXQgYSByZWZlcmVuY2UgdG8gYSBmZW5jZSBpbiBhIHN5bmMg b2JqZWN0Ci0gKiBAc3luY29iajogc3luYyBvYmplY3QuCi0gKgotICogVGhpcyBhY3F1aXJlcyBh ZGRpdGlvbmFsIHJlZmVyZW5jZSB0byAmZHJtX3N5bmNvYmouZmVuY2UgY29udGFpbmVkIGluIEBv YmosCi0gKiBpZiBub3QgTlVMTC4gSXQgaXMgaWxsZWdhbCB0byBjYWxsIHRoaXMgd2l0aG91dCBh bHJlYWR5IGhvbGRpbmcgYSByZWZlcmVuY2UuCi0gKiBObyBsb2NrcyByZXF1aXJlZC4KLSAqCi0g KiBSZXR1cm5zOgotICogRWl0aGVyIHRoZSBmZW5jZSBvZiBAb2JqIG9yIE5VTEwgaWYgdGhlcmUn cyBub25lLgotICovCi1zdGF0aWMgaW5saW5lIHN0cnVjdCBkbWFfZmVuY2UgKgotZHJtX3N5bmNv YmpfZmVuY2VfZ2V0KHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaikKLXsKLQlzdHJ1Y3QgZG1h X2ZlbmNlICpmZW5jZTsKLQotCXJjdV9yZWFkX2xvY2soKTsKLQlmZW5jZSA9IGRtYV9mZW5jZV9n ZXRfcmN1X3NhZmUoJnN5bmNvYmotPmZlbmNlKTsKLQlyY3VfcmVhZF91bmxvY2soKTsKLQotCXJl dHVybiBmZW5jZTsKLX0KLQogc3RydWN0IGRybV9zeW5jb2JqICpkcm1fc3luY29ial9maW5kKHN0 cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2YXRlLAogCQkJCSAgICAgdTMyIGhhbmRsZSk7CiB2b2lk IGRybV9zeW5jb2JqX3JlcGxhY2VfZmVuY2Uoc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLCB1 NjQgcG9pbnQsCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1k LWdmeAo=