From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH] drm/amdgpu: add pipeline sync while vmid switch in same ctx Date: Thu, 2 Jun 2016 10:23:06 -0400 Message-ID: <1464877386-27630-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk0-x243.google.com (mail-qk0-x243.google.com [IPv6:2607:f8b0:400d:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 58D506EBB3 for ; Thu, 2 Jun 2016 14:23:13 +0000 (UTC) Received: by mail-qk0-x243.google.com with SMTP id q184so5229162qkf.0 for ; Thu, 02 Jun 2016 07:23:13 -0700 (PDT) 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: Alex Deucher List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2h1bm1pbmcgWmhvdSA8RGF2aWQxLlpob3VAYW1kLmNvbT4KClNpbmNlIHZtaWQtbWdy IHN1cHBvcnRzIHZtaWQgc2hhcmluZyBpbiBvbmUgdm0sIHRoZSBzYW1lIGN0eCBjb3VsZApnZXQg ZGlmZmVyZW50IHZtaWRzIGZvciB0d28gZW1pdHMgd2l0aG91dCB2bSBmbHVzaCwgdm1fZmx1c2gg Y291bGQKYmUgZG9uZSBpbiBhbm90aGVyIHJpbmcuCgpTaWduZWQtb2ZmLWJ5OiBDaHVubWluZyBa aG91IDxEYXZpZDEuWmhvdUBhbWQuY29tPgpSZXZpZXdlZC1ieTogQWxleCBEZXVjaGVyIDxhbGV4 YW5kZXIuZGV1Y2hlckBhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhh bmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1LmggICAgfCA0ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9pYi5j IHwgOSArKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jIHwg NiArKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCmluZGV4IGM2YjVjZTMuLjQ0OTEzMmEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBAIC03OTgsNiArNzk4LDcgQEAgc3Ry dWN0IGFtZGdwdV9yaW5nIHsKIAl1bnNpZ25lZAkJY29uZF9leGVfb2ZmczsKIAl1NjQJCQkJY29u ZF9leGVfZ3B1X2FkZHI7CiAJdm9sYXRpbGUgdTMyCSpjb25kX2V4ZV9jcHVfYWRkcjsKKwlpbnQg ICAgICAgICAgICAgICAgICAgICB2bWlkOwogfTsKIAogLyoKQEAgLTkzNSw3ICs5MzYsOCBAQCBp bnQgYW1kZ3B1X3ZtX2ZsdXNoKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywKIAkJICAgIHVuc2ln bmVkIHZtX2lkLCB1aW50NjRfdCBwZF9hZGRyLAogCQkgICAgdWludDMyX3QgZ2RzX2Jhc2UsIHVp bnQzMl90IGdkc19zaXplLAogCQkgICAgdWludDMyX3QgZ3dzX2Jhc2UsIHVpbnQzMl90IGd3c19z aXplLAotCQkgICAgdWludDMyX3Qgb2FfYmFzZSwgdWludDMyX3Qgb2Ffc2l6ZSk7CisJCSAgICB1 aW50MzJfdCBvYV9iYXNlLCB1aW50MzJfdCBvYV9zaXplLAorCQkgICAgYm9vbCB2bWlkX3N3aXRj aCk7CiB2b2lkIGFtZGdwdV92bV9yZXNldF9pZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwg dW5zaWduZWQgdm1faWQpOwogdWludDY0X3QgYW1kZ3B1X3ZtX21hcF9nYXJ0KGNvbnN0IGRtYV9h ZGRyX3QgKnBhZ2VzX2FkZHIsIHVpbnQ2NF90IGFkZHIpOwogaW50IGFtZGdwdV92bV91cGRhdGVf cGFnZV9kaXJlY3Rvcnkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfaWIuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9pYi5jCmluZGV4IDM0ZTM1NDIuLjdhMGIxZTUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9pYi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9pYi5jCkBAIC0xMjIsNiArMTIyLDcgQEAgaW50IGFtZGdw dV9pYl9zY2hlZHVsZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHVuc2lnbmVkIG51bV9pYnMs CiAJYm9vbCBza2lwX3ByZWFtYmxlLCBuZWVkX2N0eF9zd2l0Y2g7CiAJdW5zaWduZWQgcGF0Y2hf b2Zmc2V0ID0gfjA7CiAJc3RydWN0IGFtZGdwdV92bSAqdm07CisJaW50IHZtaWQgPSAwLCBvbGRf dm1pZCA9IHJpbmctPnZtaWQ7CiAJc3RydWN0IGZlbmNlICpod2Y7CiAJdWludDY0X3QgY3R4Owog CkBAIC0xMzUsOSArMTM2LDExIEBAIGludCBhbWRncHVfaWJfc2NoZWR1bGUoc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nLCB1bnNpZ25lZCBudW1faWJzLAogCWlmIChqb2IpIHsKIAkJdm0gPSBqb2It PnZtOwogCQljdHggPSBqb2ItPmN0eDsKKwkJdm1pZCA9IGpvYi0+dm1faWQ7CiAJfSBlbHNlIHsK IAkJdm0gPSBOVUxMOwogCQljdHggPSAwOworCQl2bWlkID0gMDsKIAl9CiAKIAlpZiAoIXJpbmct PnJlYWR5KSB7CkBAIC0xNjMsNyArMTY2LDggQEAgaW50IGFtZGdwdV9pYl9zY2hlZHVsZShzdHJ1 Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHVuc2lnbmVkIG51bV9pYnMsCiAJCXIgPSBhbWRncHVfdm1f Zmx1c2gocmluZywgam9iLT52bV9pZCwgam9iLT52bV9wZF9hZGRyLAogCQkJCSAgICBqb2ItPmdk c19iYXNlLCBqb2ItPmdkc19zaXplLAogCQkJCSAgICBqb2ItPmd3c19iYXNlLCBqb2ItPmd3c19z aXplLAotCQkJCSAgICBqb2ItPm9hX2Jhc2UsIGpvYi0+b2Ffc2l6ZSk7CisJCQkJICAgIGpvYi0+ b2FfYmFzZSwgam9iLT5vYV9zaXplLAorCQkJCSAgICAocmluZy0+Y3VycmVudF9jdHggPT0gY3R4 KSAmJiAob2xkX3ZtaWQgIT0gdm1pZCkpOwogCQlpZiAocikgewogCQkJYW1kZ3B1X3JpbmdfdW5k byhyaW5nKTsKIAkJCXJldHVybiByOwpAQCAtMTgwLDcgKzE4NCw2IEBAIGludCBhbWRncHVfaWJf c2NoZWR1bGUoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLCB1bnNpZ25lZCBudW1faWJzLAogCW5l ZWRfY3R4X3N3aXRjaCA9IHJpbmctPmN1cnJlbnRfY3R4ICE9IGN0eDsKIAlmb3IgKGkgPSAwOyBp IDwgbnVtX2liczsgKytpKSB7CiAJCWliID0gJmlic1tpXTsKLQogCQkvKiBkcm9wIHByZWFtYmxl IElCcyBpZiB3ZSBkb24ndCBoYXZlIGEgY29udGV4dCBzd2l0Y2ggKi8KIAkJaWYgKChpYi0+Zmxh Z3MgJiBBTURHUFVfSUJfRkxBR19QUkVBTUJMRSkgJiYgc2tpcF9wcmVhbWJsZSkKIAkJCWNvbnRp bnVlOwpAQCAtMTg4LDYgKzE5MSw3IEBAIGludCBhbWRncHVfaWJfc2NoZWR1bGUoc3RydWN0IGFt ZGdwdV9yaW5nICpyaW5nLCB1bnNpZ25lZCBudW1faWJzLAogCQlhbWRncHVfcmluZ19lbWl0X2li KHJpbmcsIGliLCBqb2IgPyBqb2ItPnZtX2lkIDogMCwKIAkJCQkgICAgbmVlZF9jdHhfc3dpdGNo KTsKIAkJbmVlZF9jdHhfc3dpdGNoID0gZmFsc2U7CisJCXJpbmctPnZtaWQgPSB2bWlkOwogCX0K IAogCWlmIChyaW5nLT5mdW5jcy0+ZW1pdF9oZHBfaW52YWxpZGF0ZSkKQEAgLTE5OCw2ICsyMDIs NyBAQCBpbnQgYW1kZ3B1X2liX3NjaGVkdWxlKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgdW5z aWduZWQgbnVtX2licywKIAkJZGV2X2VycihhZGV2LT5kZXYsICJmYWlsZWQgdG8gZW1pdCBmZW5j ZSAoJWQpXG4iLCByKTsKIAkJaWYgKGpvYiAmJiBqb2ItPnZtX2lkKQogCQkJYW1kZ3B1X3ZtX3Jl c2V0X2lkKGFkZXYsIGpvYi0+dm1faWQpOworCQlyaW5nLT52bWlkID0gb2xkX3ZtaWQ7CiAJCWFt ZGdwdV9yaW5nX3VuZG8ocmluZyk7CiAJCXJldHVybiByOwogCX0KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X3ZtLmMKaW5kZXggOWYzNmVkMy4uNjJhNGMxMiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKQEAgLTI5OCw3ICsyOTgsOCBAQCBpbnQgYW1kZ3B1X3Zt X2ZsdXNoKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywKIAkJICAgIHVuc2lnbmVkIHZtX2lkLCB1 aW50NjRfdCBwZF9hZGRyLAogCQkgICAgdWludDMyX3QgZ2RzX2Jhc2UsIHVpbnQzMl90IGdkc19z aXplLAogCQkgICAgdWludDMyX3QgZ3dzX2Jhc2UsIHVpbnQzMl90IGd3c19zaXplLAotCQkgICAg dWludDMyX3Qgb2FfYmFzZSwgdWludDMyX3Qgb2Ffc2l6ZSkKKwkJICAgIHVpbnQzMl90IG9hX2Jh c2UsIHVpbnQzMl90IG9hX3NpemUsCisJCSAgICBib29sIHZtaWRfc3dpdGNoKQogewogCXN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2ID0gcmluZy0+YWRldjsKIAlzdHJ1Y3QgYW1kZ3B1X3ZtX2lk ICppZCA9ICZhZGV2LT52bV9tYW5hZ2VyLmlkc1t2bV9pZF07CkBAIC0zMTIsOCArMzEzLDcgQEAg aW50IGFtZGdwdV92bV9mbHVzaChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAJaW50IHI7CiAK IAlpZiAocmluZy0+ZnVuY3MtPmVtaXRfcGlwZWxpbmVfc3luYyAmJiAoCi0JICAgIHBkX2FkZHIg IT0gQU1ER1BVX1ZNX05PX0ZMVVNIIHx8IGdkc19zd2l0Y2hfbmVlZGVkIHx8Ci0JCSAgICByaW5n LT50eXBlID09IEFNREdQVV9SSU5HX1RZUEVfQ09NUFVURSkpCisJICAgIHBkX2FkZHIgIT0gQU1E R1BVX1ZNX05PX0ZMVVNIIHx8IGdkc19zd2l0Y2hfbmVlZGVkIHx8IHZtaWRfc3dpdGNoKSkKIAkJ YW1kZ3B1X3JpbmdfZW1pdF9waXBlbGluZV9zeW5jKHJpbmcpOwogCiAJaWYgKHJpbmctPmZ1bmNz LT5lbWl0X3ZtX2ZsdXNoICYmCi0tIAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==