From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH 5/5] drm/amdgpu: Set MASTER_UPDATE_MODE to 0 again Date: Fri, 10 Jun 2016 17:57:13 +0900 Message-ID: <1465549033-16561-6-git-send-email-michel@daenzer.net> References: <1465549033-16561-1-git-send-email-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.gna.ch (darkcity.gna.ch [195.226.6.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 10D426ECB5 for ; Fri, 10 Jun 2016 08:57:21 +0000 (UTC) In-Reply-To: <1465549033-16561-1-git-send-email-michel@daenzer.net> 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 List-Id: dri-devel@lists.freedesktop.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpXaXRoIHRoZSBw cmV2aW91cyBjaGFuZ2UsIGl0J3Mgc2FmZSB0byBsZXQgcGFnZSBmbGlwcyB0YWtlIGVmZmVjdAph bnl0aW1lIGR1cmluZyBhIHZlcnRpY2FsIGJsYW5rIHBlcmlvZC4KClRoaXMgY2FuIGF2b2lkIGRl bGF5aW5nIGEgZmxpcCBieSBhIGZyYW1lIGluIHNvbWUgY2FzZXMgd2hlcmUgd2Ugb25seQpnZXQg dG8gYW1kZ3B1X2ZsaXBfd29ya19mdW5jIC0+IGFkZXYtPm1vZGVfaW5mby5mdW5jcy0+cGFnZV9m bGlwIGR1cmluZwp0aGUgdGFyZ2V0IHZlcnRpY2FsIGJsYW5rIHBlcmlvZC4KClNpZ25lZC1vZmYt Ynk6IE1pY2hlbCBEw6RuemVyIDxtaWNoZWwuZGFlbnplckBhbWQuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92MTBfMC5jIHwgOCArKysrLS0tLQogZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvZGNlX3YxMV8wLmMgfCA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2RjZV92OF8wLmMgIHwgOCArKysrLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNl cnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9kY2VfdjEwXzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92 MTBfMC5jCmluZGV4IGJlMWNmMzguLjk5YTQ2MzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2RjZV92MTBfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2RjZV92MTBfMC5jCkBAIC02NDYsOCArNjQ2LDggQEAgc3RhdGljIHZvaWQgZGNlX3YxMF8wX3Jl c3VtZV9tY19hY2Nlc3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAKIAkJaWYgKHNhdmUt PmNydGNfZW5hYmxlZFtpXSkgewogCQkJdG1wID0gUlJFRzMyKG1tTUFTVEVSX1VQREFURV9NT0RF ICsgY3J0Y19vZmZzZXRzW2ldKTsKLQkJCWlmIChSRUdfR0VUX0ZJRUxEKHRtcCwgTUFTVEVSX1VQ REFURV9NT0RFLCBNQVNURVJfVVBEQVRFX01PREUpICE9IDMpIHsKLQkJCQl0bXAgPSBSRUdfU0VU X0ZJRUxEKHRtcCwgTUFTVEVSX1VQREFURV9NT0RFLCBNQVNURVJfVVBEQVRFX01PREUsIDMpOwor CQkJaWYgKFJFR19HRVRfRklFTEQodG1wLCBNQVNURVJfVVBEQVRFX01PREUsIE1BU1RFUl9VUERB VEVfTU9ERSkgIT0gMCkgeworCQkJCXRtcCA9IFJFR19TRVRfRklFTEQodG1wLCBNQVNURVJfVVBE QVRFX01PREUsIE1BU1RFUl9VUERBVEVfTU9ERSwgMCk7CiAJCQkJV1JFRzMyKG1tTUFTVEVSX1VQ REFURV9NT0RFICsgY3J0Y19vZmZzZXRzW2ldLCB0bXApOwogCQkJfQogCQkJdG1wID0gUlJFRzMy KG1tR1JQSF9VUERBVEUgKyBjcnRjX29mZnNldHNbaV0pOwpAQCAtMjI3NSw4ICsyMjc1LDggQEAg c3RhdGljIGludCBkY2VfdjEwXzBfY3J0Y19kb19zZXRfYmFzZShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAJV1JFRzMyKG1tVklFV1BPUlRfU0laRSArIGFtZGdwdV9jcnRjLT5jcnRjX29mZnNldCwK IAkgICAgICAgKHZpZXdwb3J0X3cgPDwgMTYpIHwgdmlld3BvcnRfaCk7CiAKLQkvKiBzZXQgcGFn ZWZsaXAgdG8gaGFwcGVuIG9ubHkgYXQgc3RhcnQgb2YgdmJsYW5rIGludGVydmFsIChmcm9udCBw b3JjaCkgKi8KLQlXUkVHMzIobW1NQVNURVJfVVBEQVRFX01PREUgKyBhbWRncHVfY3J0Yy0+Y3J0 Y19vZmZzZXQsIDMpOworCS8qIHNldCBwYWdlZmxpcCB0byBoYXBwZW4gYW55d2hlcmUgaW4gdmJs YW5rIGludGVydmFsICovCisJV1JFRzMyKG1tTUFTVEVSX1VQREFURV9NT0RFICsgYW1kZ3B1X2Ny dGMtPmNydGNfb2Zmc2V0LCAwKTsKIAogCWlmICghYXRvbWljICYmIGZiICYmIGZiICE9IGNydGMt PnByaW1hcnktPmZiKSB7CiAJCWFtZGdwdV9mYiA9IHRvX2FtZGdwdV9mcmFtZWJ1ZmZlcihmYik7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kY2VfdjExXzAuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92MTFfMC5jCmluZGV4IGNkMmVjODEuLjQ0ZjBk MjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92MTFfMC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92MTFfMC5jCkBAIC0yMjUxLDggKzIy NTEsOCBAQCBzdGF0aWMgaW50IGRjZV92MTFfMF9jcnRjX2RvX3NldF9iYXNlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAlXUkVHMzIobW1WSUVXUE9SVF9TSVpFICsgYW1kZ3B1X2NydGMtPmNydGNf b2Zmc2V0LAogCSAgICAgICAodmlld3BvcnRfdyA8PCAxNikgfCB2aWV3cG9ydF9oKTsKIAotCS8q IHNldCBwYWdlZmxpcCB0byBoYXBwZW4gb25seSBhdCBzdGFydCBvZiB2YmxhbmsgaW50ZXJ2YWwg KGZyb250IHBvcmNoKSAqLwotCVdSRUczMihtbUNSVENfTUFTVEVSX1VQREFURV9NT0RFICsgYW1k Z3B1X2NydGMtPmNydGNfb2Zmc2V0LCAzKTsKKwkvKiBzZXQgcGFnZWZsaXAgdG8gaGFwcGVuIGFu eXdoZXJlIGluIHZibGFuayBpbnRlcnZhbCAqLworCVdSRUczMihtbUNSVENfTUFTVEVSX1VQREFU RV9NT0RFICsgYW1kZ3B1X2NydGMtPmNydGNfb2Zmc2V0LCAwKTsKIAogCWlmICghYXRvbWljICYm IGZiICYmIGZiICE9IGNydGMtPnByaW1hcnktPmZiKSB7CiAJCWFtZGdwdV9mYiA9IHRvX2FtZGdw dV9mcmFtZWJ1ZmZlcihmYik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9kY2VfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZGNlX3Y4XzAuYwppbmRl eCBjMDg3ZjkzLi44Njg2NGRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9kY2VfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RjZV92OF8wLmMK QEAgLTU5MSw4ICs1OTEsOCBAQCBzdGF0aWMgdm9pZCBkY2VfdjhfMF9yZXN1bWVfbWNfYWNjZXNz KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCiAJCWlmIChzYXZlLT5jcnRjX2VuYWJsZWRb aV0pIHsKIAkJCXRtcCA9IFJSRUczMihtbU1BU1RFUl9VUERBVEVfTU9ERSArIGNydGNfb2Zmc2V0 c1tpXSk7Ci0JCQlpZiAoUkVHX0dFVF9GSUVMRCh0bXAsIE1BU1RFUl9VUERBVEVfTU9ERSwgTUFT VEVSX1VQREFURV9NT0RFKSAhPSAzKSB7Ci0JCQkJdG1wID0gUkVHX1NFVF9GSUVMRCh0bXAsIE1B U1RFUl9VUERBVEVfTU9ERSwgTUFTVEVSX1VQREFURV9NT0RFLCAzKTsKKwkJCWlmIChSRUdfR0VU X0ZJRUxEKHRtcCwgTUFTVEVSX1VQREFURV9NT0RFLCBNQVNURVJfVVBEQVRFX01PREUpICE9IDAp IHsKKwkJCQl0bXAgPSBSRUdfU0VUX0ZJRUxEKHRtcCwgTUFTVEVSX1VQREFURV9NT0RFLCBNQVNU RVJfVVBEQVRFX01PREUsIDApOwogCQkJCVdSRUczMihtbU1BU1RFUl9VUERBVEVfTU9ERSArIGNy dGNfb2Zmc2V0c1tpXSwgdG1wKTsKIAkJCX0KIAkJCXRtcCA9IFJSRUczMihtbUdSUEhfVVBEQVRF ICsgY3J0Y19vZmZzZXRzW2ldKTsKQEAgLTIxOTAsOCArMjE5MCw4IEBAIHN0YXRpYyBpbnQgZGNl X3Y4XzBfY3J0Y19kb19zZXRfYmFzZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJV1JFRzMyKG1t VklFV1BPUlRfU0laRSArIGFtZGdwdV9jcnRjLT5jcnRjX29mZnNldCwKIAkgICAgICAgKHZpZXdw b3J0X3cgPDwgMTYpIHwgdmlld3BvcnRfaCk7CiAKLQkvKiBzZXQgcGFnZWZsaXAgdG8gaGFwcGVu IG9ubHkgYXQgc3RhcnQgb2YgdmJsYW5rIGludGVydmFsIChmcm9udCBwb3JjaCkgKi8KLQlXUkVH MzIobW1NQVNURVJfVVBEQVRFX01PREUgKyBhbWRncHVfY3J0Yy0+Y3J0Y19vZmZzZXQsIDMpOwor CS8qIHNldCBwYWdlZmxpcCB0byBoYXBwZW4gYW55d2hlcmUgaW4gdmJsYW5rIGludGVydmFsICov CisJV1JFRzMyKG1tTUFTVEVSX1VQREFURV9NT0RFICsgYW1kZ3B1X2NydGMtPmNydGNfb2Zmc2V0 LCAwKTsKIAogCWlmICghYXRvbWljICYmIGZiICYmIGZiICE9IGNydGMtPnByaW1hcnktPmZiKSB7 CiAJCWFtZGdwdV9mYiA9IHRvX2FtZGdwdV9mcmFtZWJ1ZmZlcihmYik7Ci0tIAoyLjguMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==