From: Chunming Zhou Subject: [PATCH 6/8] drm: merge normal syncobj to timeline syncobj Date: Fri, 24 Aug 2018 20:12:08 +0800 Message-ID: <20180824121210.19101-6-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 bm9ybWFsIHN5bmNvYmogY2FuIGJlIHVuaWZpZWQgdG8gdGltZWxpbmUgc3luY29iai4KVGhlIHRo aW5na2luZyBpczoKYS4gc2luZ2FsIG9wIGFsd2F5cyBhcHBlbmQgdG8gc2luYWwgbGlzdCB0YWls LgpiLiB3YWl0IG9wIGFsd2F5cyB3YWl0IG9uIGxhc3Qgc2luYWwgcG9pbnQuCgp0aGUgZHJpdmVy IGluZGVlZCBiZSBzaW1wbGlmaWVkIG1vcmUuCgpTaWduZWQtb2ZmLWJ5OiBDaHVubWluZyBaaG91 IDxkYXZpZDEuemhvdUBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fc3luY29iai5j IHwgMTEzICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA1MiBpbnNlcnRpb25zKCspLCA2MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX3N5bmNvYmouYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fc3luY29iai5jCmlu ZGV4IGUwZDg5YTg0MzU5Zi4uZmYwYjFmZGZkOWE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vZHJtX3N5bmNvYmouYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3N5bmNvYmouYwpAQCAt NTYsNiArNTYsOSBAQAogI2luY2x1ZGUgImRybV9pbnRlcm5hbC5oIgogI2luY2x1ZGUgPGRybS9k cm1fc3luY29iai5oPgogCisvKiBtZXJnZSBub3JtYWwgc3luY29iaiB0byB0aW1lbGluZSBzeW5j b2JqLCB0aGUgcG9pbnQgaW50ZXJ2YWwgaXMgMSAqLworI2RlZmluZSBEUk1fU1lOQ09CSl9OT1JN QUxfUE9JTlQgMQorCiBzdHJ1Y3QgZHJtX3N5bmNvYmpfc3R1Yl9mZW5jZSB7CiAJc3RydWN0IGRt YV9mZW5jZSBiYXNlOwogCXNwaW5sb2NrX3QgbG9jazsKQEAgLTMzMywzMiArMzM2LDE3IEBAIHZv aWQgZHJtX3N5bmNvYmpfcmVwbGFjZV9mZW5jZShzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmos CiAJCQkgICAgICAgdTY0IHBvaW50LAogCQkJICAgICAgIHN0cnVjdCBkbWFfZmVuY2UgKmZlbmNl KQogewotCXN0cnVjdCBkbWFfZmVuY2UgKm9sZF9mZW5jZTsKLQlzdHJ1Y3QgZHJtX3N5bmNvYmpf Y2IgKmN1ciwgKnRtcDsKLQogCWlmIChzeW5jb2JqLT50eXBlID09IERSTV9TWU5DT0JKX1RZUEVf VElNRUxJTkUpIHsKIAkJZHJtX3N5bmNvYmpfdGltZWxpbmVfY3JlYXRlX3NpZ25hbF9wdChzeW5j b2JqLCBmZW5jZSwgcG9pbnQpOwogCQlyZXR1cm47CisJfSBlbHNlIGlmIChzeW5jb2JqLT50eXBl ID09IERSTV9TWU5DT0JKX1RZUEVfTk9STUFMKSB7CisJCXU2NCBwdF92YWx1ZSA9IHN5bmNvYmot PnN5bmNvYmpfdGltZWxpbmUuc2lnbmFsX3BvaW50ICsKKwkJCURSTV9TWU5DT0JKX05PUk1BTF9Q T0lOVDsKKwkJZHJtX3N5bmNvYmpfdGltZWxpbmVfY3JlYXRlX3NpZ25hbF9wdChzeW5jb2JqLCBm ZW5jZSwgcHRfdmFsdWUpOworCQlyZXR1cm47CisJfSBlbHNlIHsKKwkJRFJNX0VSUk9SKCJ0aGUg c3luY29iaiB0eXBlIGlzbid0IHN1cHBvcnRcbiIpOwogCX0KLQlpZiAoZmVuY2UpCi0JCWRtYV9m ZW5jZV9nZXQoZmVuY2UpOwotCi0Jc3Bpbl9sb2NrKCZzeW5jb2JqLT5sb2NrKTsKLQotCW9sZF9m ZW5jZSA9IHJjdV9kZXJlZmVyZW5jZV9wcm90ZWN0ZWQoc3luY29iai0+ZmVuY2UsCi0JCQkJCSAg ICAgIGxvY2tkZXBfaXNfaGVsZCgmc3luY29iai0+bG9jaykpOwotCXJjdV9hc3NpZ25fcG9pbnRl cihzeW5jb2JqLT5mZW5jZSwgZmVuY2UpOwotCi0JaWYgKGZlbmNlICE9IG9sZF9mZW5jZSkgewot CQlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUoY3VyLCB0bXAsICZzeW5jb2JqLT5jYl9saXN0LCBu b2RlKSB7Ci0JCQlsaXN0X2RlbF9pbml0KCZjdXItPm5vZGUpOwotCQkJY3VyLT5mdW5jKHN5bmNv YmosIGN1cik7Ci0JCX0KLQl9Ci0KLQlzcGluX3VubG9jaygmc3luY29iai0+bG9jayk7Ci0KLQlk bWFfZmVuY2VfcHV0KG9sZF9mZW5jZSk7CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9zeW5jb2JqX3Jl cGxhY2VfZmVuY2UpOwogCkBAIC00NTIsNyArNDQwLDcgQEAgZHJtX3N5bmNvYmpfdGltZWxpbmVf Y3JlYXRlX3dhaXRfcHQoc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLCB1NjQgcG9pbnQpCiB9 CiAKIHN0YXRpYyBzdHJ1Y3QgZG1hX2ZlbmNlICoKLWRybV9zeW5jb2JqX3RpbWVsaW5lX3BvaW50 X2dldChzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosIHU2NCBwb2ludCwgdTY0IGZsYWcpCitk cm1fc3luY29ial90aW1lbGluZV9wb2ludF9nZXQoc3RydWN0IGRybV9zeW5jb2JqICpzeW5jb2Jq LCB1NjQgcG9pbnQsIHU2NCBmbGFncykKIHsKIAlzdHJ1Y3QgZHJtX3N5bmNvYmpfd2FpdF9wdCAq d2FpdF9wdDsKIApAQCAtNDgxLDEzICs0NjksMTUgQEAgZHJtX3N5bmNvYmpfdGltZWxpbmVfcG9p bnRfZ2V0KHN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiwgdTY0IHBvaW50LCB1NjQgZmxhZykK IAl9CiAJaWYgKHdhaXRfcHQpIHsKIAkJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2U7Ci0JCWludCBy ZXQgPQotCQkJd2FpdF9ldmVudF9pbnRlcnJ1cHRpYmxlX3RpbWVvdXQoc3luY29iai0+c3luY29i al90aW1lbGluZS53cSwKLQkJCQl3YWl0X3B0LT52YWx1ZSA8PSBzeW5jb2JqLT5zeW5jb2JqX3Rp bWVsaW5lLnNpZ25hbF9wb2ludCwKLQkJCQltc2Vjc190b19qaWZmaWVzKDEwMDAwKSk7IC8qIHdh aXQgMTBzICovCi0KLQkJaWYgKHJldCA8PSAwKQotCQkJcmV0dXJuIE5VTEw7CisJCWludCByZXQg PSAwOworCisJCWlmIChmbGFncyAmIERSTV9TWU5DT0JKX1dBSVRfRkxBR1NfV0FJVF9GT1JfU1VC TUlUKSB7CisJCQlyZXQgPSB3YWl0X2V2ZW50X2ludGVycnVwdGlibGVfdGltZW91dChzeW5jb2Jq LT5zeW5jb2JqX3RpbWVsaW5lLndxLAorCQkJCQkJCSAgICAgICB3YWl0X3B0LT52YWx1ZSA8PSBz eW5jb2JqLT5zeW5jb2JqX3RpbWVsaW5lLnNpZ25hbF9wb2ludCwKKwkJCQkJCQkgICAgICAgbXNl Y3NfdG9famlmZmllcygxMDAwMCkpOyAvKiB3YWl0IDEwcyAqLworCQkJaWYgKHJldCA8PSAwKQor CQkJCXJldHVybiBOVUxMOworCQl9CiAJCXJjdV9yZWFkX2xvY2soKTsKIAkJZmVuY2UgPSBkbWFf ZmVuY2VfZ2V0X3JjdSgmd2FpdF9wdC0+YmFzZS5iYXNlKTsKIAkJcmN1X3JlYWRfdW5sb2NrKCk7 CkBAIC01MTAsMjMgKzUwMCwyNiBAQCBkcm1fc3luY29ial90aW1lbGluZV9wb2ludF9nZXQoc3Ry dWN0IGRybV9zeW5jb2JqICpzeW5jb2JqLCB1NjQgcG9pbnQsIHU2NCBmbGFnKQogICogY29udGFp bnMgYSByZWZlcmVuY2UgdG8gdGhlIGZlbmNlLCB3aGljaCBtdXN0IGJlIHJlbGVhc2VkIGJ5IGNh bGxpbmcKICAqIGRtYV9mZW5jZV9wdXQoKS4KICAqLwotaW50IGRybV9zeW5jb2JqX2ZpbmRfZmVu Y2Uoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXZhdGUsCi0JCQkgICB1MzIgaGFuZGxlLCB1NjQg cG9pbnQsCi0JCQkgICBzdHJ1Y3QgZG1hX2ZlbmNlICoqZmVuY2UpCitzdGF0aWMgaW50IGRybV9z eW5jb2JqX3NlYXJjaF9mZW5jZShzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmosIHU2NCBwb2lu dCwKKwkJCQkgICAgdTY0IGZsYWdzLCBzdHJ1Y3QgZG1hX2ZlbmNlICoqZmVuY2UpCiB7Ci0Jc3Ry dWN0IGRybV9zeW5jb2JqICpzeW5jb2JqID0gZHJtX3N5bmNvYmpfZmluZChmaWxlX3ByaXZhdGUs IGhhbmRsZSk7CiAJaW50IHJldCA9IDA7CiAKIAlpZiAoIXN5bmNvYmopCiAJCXJldHVybiAtRU5P RU5UOwogCiAJaWYgKHN5bmNvYmotPnR5cGUgPT0gRFJNX1NZTkNPQkpfVFlQRV9OT1JNQUwpIHsK KwkJdTY0IHRhaWxfcHRfdmFsdWUgPSBzeW5jb2JqLT5zeW5jb2JqX3RpbWVsaW5lLnNpZ25hbF9w b2ludDsKKworCQlpZiAodGFpbF9wdF92YWx1ZSA9PSAwKQorCQkJdGFpbF9wdF92YWx1ZSArPSBE Uk1fU1lOQ09CSl9OT1JNQUxfUE9JTlQ7CiAJCS8qIE5PUk1BTCBzeW5jb2JqIGRvZXNuJ3QgY2Fy ZSBwb2ludCB2YWx1ZSAqLwogCQlXQVJOX09OKHBvaW50ICE9IDApOwotCQkqZmVuY2UgPSBkcm1f c3luY29ial9mZW5jZV9nZXQoc3luY29iaik7CisJCSpmZW5jZSA9IGRybV9zeW5jb2JqX3RpbWVs aW5lX3BvaW50X2dldChzeW5jb2JqLCB0YWlsX3B0X3ZhbHVlLAorCQkJCQkJCWZsYWdzKTsKIAl9 IGVsc2UgaWYgKHN5bmNvYmotPnR5cGUgPT0gRFJNX1NZTkNPQkpfVFlQRV9USU1FTElORSkgewog CQkqZmVuY2UgPSBkcm1fc3luY29ial90aW1lbGluZV9wb2ludF9nZXQoc3luY29iaiwgcG9pbnQs Ci0JCQkJCQkJRFJNX1NZTkNPQkpfV0FJVF9GTEFHU19XQUlUX0ZPUl9TVUJNSVQpOworCQkJCQkJ CWZsYWdzKTsKIAl9IGVsc2UgewogCQlEUk1fRVJST1IoIkRvbid0IHN1cHBvcnQgdGhpcyB0eXBl IHN5bmNvYmpcbiIpOwogCQkqZmVuY2UgPSBOVUxMOwpAQCAtNTM3LDYgKzUzMCwxNSBAQCBpbnQg ZHJtX3N5bmNvYmpfZmluZF9mZW5jZShzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdmF0ZSwKIAlk cm1fc3luY29ial9wdXQoc3luY29iaik7CiAJcmV0dXJuIHJldDsKIH0KK2ludCBkcm1fc3luY29i al9maW5kX2ZlbmNlKHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2YXRlLAorCQkJICAgdTMyIGhh bmRsZSwgdTY0IHBvaW50LAorCQkJICAgc3RydWN0IGRtYV9mZW5jZSAqKmZlbmNlKSB7CisJc3Ry dWN0IGRybV9zeW5jb2JqICpzeW5jb2JqID0gZHJtX3N5bmNvYmpfZmluZChmaWxlX3ByaXZhdGUs IGhhbmRsZSk7CisKKwlyZXR1cm4gZHJtX3N5bmNvYmpfc2VhcmNoX2ZlbmNlKHN5bmNvYmosIHBv aW50LAorCQkJCQlEUk1fU1lOQ09CSl9XQUlUX0ZMQUdTX1dBSVRfRk9SX1NVQk1JVCwKKwkJCQkJ ZmVuY2UpOworfQogRVhQT1JUX1NZTUJPTChkcm1fc3luY29ial9maW5kX2ZlbmNlKTsKIAogc3Rh dGljIHZvaWQgZHJtX3N5bmNvYmpfdGltZWxpbmVfZmluaShzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5 bmNvYmosCkBAIC01NzgsNyArNTgwLDYgQEAgdm9pZCBkcm1fc3luY29ial9mcmVlKHN0cnVjdCBr cmVmICprcmVmKQogCXN0cnVjdCBkcm1fc3luY29iaiAqc3luY29iaiA9IGNvbnRhaW5lcl9vZihr cmVmLAogCQkJCQkJICAgc3RydWN0IGRybV9zeW5jb2JqLAogCQkJCQkJICAgcmVmY291bnQpOwot CWRybV9zeW5jb2JqX3JlcGxhY2VfZmVuY2Uoc3luY29iaiwgMCwgTlVMTCk7CiAJZHJtX3N5bmNv YmpfdGltZWxpbmVfZmluaShzeW5jb2JqLCAmc3luY29iai0+c3luY29ial90aW1lbGluZSk7CiAJ a2ZyZWUoc3luY29iaik7CiB9CkBAIC0xMDMxLDE0ICsxMDMyLDExIEBAIHN0YXRpYyBzaWduZWQg bG9uZyBkcm1fc3luY29ial9hcnJheV93YWl0X3RpbWVvdXQoc3RydWN0IGRybV9zeW5jb2JqICoq c3luY29ianMsCiAJc2lnbmFsZWRfY291bnQgPSAwOwogCWZvciAoaSA9IDA7IGkgPCBjb3VudDsg KytpKSB7CiAJCWVudHJpZXNbaV0udGFzayA9IGN1cnJlbnQ7Ci0JCWVudHJpZXNbaV0uZmVuY2Ug PSBkcm1fc3luY29ial9mZW5jZV9nZXQoc3luY29ianNbaV0pOworCQlyZXQgPSBkcm1fc3luY29i al9zZWFyY2hfZmVuY2Uoc3luY29ianNbaV0sIDAsIDAsCisJCQkJCSAgICAgICAmZW50cmllc1tp XS5mZW5jZSk7CiAJCWlmICghZW50cmllc1tpXS5mZW5jZSkgewotCQkJaWYgKGZsYWdzICYgRFJN X1NZTkNPQkpfV0FJVF9GTEFHU19XQUlUX0ZPUl9TVUJNSVQpIHsKLQkJCQljb250aW51ZTsKLQkJ CX0gZWxzZSB7Ci0JCQkJcmV0ID0gLUVJTlZBTDsKLQkJCQlnb3RvIGNsZWFudXBfZW50cmllczsK LQkJCX0KKwkJCXJldCA9IC1FSU5WQUw7CisJCQlnb3RvIGNsZWFudXBfZW50cmllczsKIAkJfQog CiAJCWlmIChkbWFfZmVuY2VfaXNfc2lnbmFsZWQoZW50cmllc1tpXS5mZW5jZSkpIHsKQEAgLTEw NjYsMTUgKzEwNjQsNiBAQCBzdGF0aWMgc2lnbmVkIGxvbmcgZHJtX3N5bmNvYmpfYXJyYXlfd2Fp dF90aW1lb3V0KHN0cnVjdCBkcm1fc3luY29iaiAqKnN5bmNvYmpzLAogCSAqIGZhbGx0aG91Z2gg YW5kIHRyeSBhIDAgdGltZW91dCB3YWl0IQogCSAqLwogCi0JaWYgKGZsYWdzICYgRFJNX1NZTkNP QkpfV0FJVF9GTEFHU19XQUlUX0ZPUl9TVUJNSVQpIHsKLQkJZm9yIChpID0gMDsgaSA8IGNvdW50 OyArK2kpIHsKLQkJCWRybV9zeW5jb2JqX2ZlbmNlX2dldF9vcl9hZGRfY2FsbGJhY2soc3luY29i anNbaV0sCi0JCQkJCQkJICAgICAgJmVudHJpZXNbaV0uZmVuY2UsCi0JCQkJCQkJICAgICAgJmVu dHJpZXNbaV0uc3luY29ial9jYiwKLQkJCQkJCQkgICAgICBzeW5jb2JqX3dhaXRfc3luY29ial9m dW5jKTsKLQkJfQotCX0KLQogCWRvIHsKIAkJc2V0X2N1cnJlbnRfc3RhdGUoVEFTS19JTlRFUlJV UFRJQkxFKTsKIApAQCAtMTEyMiwxMyArMTExMSwxMCBAQCBzdGF0aWMgc2lnbmVkIGxvbmcgZHJt X3N5bmNvYmpfYXJyYXlfd2FpdF90aW1lb3V0KHN0cnVjdCBkcm1fc3luY29iaiAqKnN5bmNvYmpz LAogCiBjbGVhbnVwX2VudHJpZXM6CiAJZm9yIChpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKLQkJ aWYgKGVudHJpZXNbaV0uc3luY29ial9jYi5mdW5jKQotCQkJZHJtX3N5bmNvYmpfcmVtb3ZlX2Nh bGxiYWNrKHN5bmNvYmpzW2ldLAotCQkJCQkJICAgICZlbnRyaWVzW2ldLnN5bmNvYmpfY2IpOwor CQlkbWFfZmVuY2VfcHV0KGVudHJpZXNbaV0uZmVuY2UpOwogCQlpZiAoZW50cmllc1tpXS5mZW5j ZV9jYi5mdW5jKQogCQkJZG1hX2ZlbmNlX3JlbW92ZV9jYWxsYmFjayhlbnRyaWVzW2ldLmZlbmNl LAogCQkJCQkJICAmZW50cmllc1tpXS5mZW5jZV9jYik7Ci0JCWRtYV9mZW5jZV9wdXQoZW50cmll c1tpXS5mZW5jZSk7CiAJfQogCWtmcmVlKGVudHJpZXMpOwogCkBAIC0xMzAzLDEyICsxMjg5LDE3 IEBAIGRybV9zeW5jb2JqX3Jlc2V0X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQg KmRhdGEsCiAJaWYgKHJldCA8IDApCiAJCXJldHVybiByZXQ7CiAKLQlmb3IgKGkgPSAwOyBpIDwg YXJncy0+Y291bnRfaGFuZGxlczsgaSsrKQotCQlkcm1fc3luY29ial9yZXBsYWNlX2ZlbmNlKHN5 bmNvYmpzW2ldLCAwLCBOVUxMKTsKLQorCWZvciAoaSA9IDA7IGkgPCBhcmdzLT5jb3VudF9oYW5k bGVzOyBpKyspIHsKKwkJaWYgKHN5bmNvYmpzW2ldLT50eXBlID09IERSTV9TWU5DT0JKX1RZUEVf VElNRUxJTkUpIHsKKwkJCURSTV9FUlJPUigidGltZWxpbmUgc3luY29iaiBjYW5ub3QgcmVzZXQh XG4iKTsKKwkJCXJldCA9IC1FSU5WQUw7CisJCQlnb3RvIG91dDsKKwkJfQorCX0KK291dDoKIAlk cm1fc3luY29ial9hcnJheV9mcmVlKHN5bmNvYmpzLCBhcmdzLT5jb3VudF9oYW5kbGVzKTsKIAot CXJldHVybiAwOworCXJldHVybiByZXQ7CiB9CiAKIGludAotLSAKMi4xNy4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK