From: Harry Wentland Subject: [PATCH 12/12] drm/amd/display: fix up construction of scratch_val_ctx Date: Wed, 7 Dec 2016 20:26:24 -0500 Message-ID: <20161208012624.8914-13-harry.wentland@amd.com> References: <20161208012624.8914-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161208012624.8914-1-harry.wentland-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: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Dmytro Laktyushkin RnJvbTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4KCkNo YW5nZS1JZDogSWQyOTNmZGY4YzY5Mzk2OThiN2Q4NzlmZGE5OWM2NTM1Yzg2NWFiNzEKU2lnbmVk LW9mZi1ieTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jICAgICAgICB8IDEy ICsrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9jb3JlX3R5 cGVzLmggfCAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUv ZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMKaW5kZXggNTIy ZWY3MDQ3NTY0Li44ZTFkNjk1ZmNiNzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9jb3JlL2RjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2NvcmUvZGMuYwpAQCAtNDUwLDExICs0NTAsNiBAQCBzdGF0aWMgdm9pZCBkZXN0cnVjdChzdHJ1 Y3QgY29yZV9kYyAqZGMpCiB7CiAJcmVzb3VyY2VfdmFsaWRhdGVfY3R4X2Rlc3RydWN0KGRjLT5j dXJyZW50X2NvbnRleHQpOwogCi0JZG1fZnJlZShkYy0+dGVtcF9mbGlwX2NvbnRleHQpOwotCWRj LT50ZW1wX2ZsaXBfY29udGV4dCA9IE5VTEw7Ci0JZG1fZnJlZShkYy0+c2NyYXRjaF92YWxfY3R4 KTsKLQlkYy0+c2NyYXRjaF92YWxfY3R4ID0gTlVMTDsKLQogCWRlc3Ryb3lfbGlua3MoZGMpOwog CiAJZGNfZGVzdHJveV9yZXNvdXJjZV9wb29sKGRjKTsKQEAgLTQ3Myw2ICs0NjgsMTAgQEAgc3Rh dGljIHZvaWQgZGVzdHJ1Y3Qoc3RydWN0IGNvcmVfZGMgKmRjKQogCiAJZG1fZnJlZShkYy0+Y3Vy cmVudF9jb250ZXh0KTsKIAlkYy0+Y3VycmVudF9jb250ZXh0ID0gTlVMTDsKKwlkbV9mcmVlKGRj LT50ZW1wX2ZsaXBfY29udGV4dCk7CisJZGMtPnRlbXBfZmxpcF9jb250ZXh0ID0gTlVMTDsKKwlk bV9mcmVlKGRjLT5zY3JhdGNoX3ZhbF9jdHgpOworCWRjLT5zY3JhdGNoX3ZhbF9jdHggPSBOVUxM OwogCiAJZG1fZnJlZShkYy0+Y3R4KTsKIAlkYy0+Y3R4ID0gTlVMTDsKQEAgLTQ5Miw3ICs0OTEs NyBAQCBzdGF0aWMgYm9vbCBjb25zdHJ1Y3Qoc3RydWN0IGNvcmVfZGMgKmRjLAogCiAJZGMtPmN1 cnJlbnRfY29udGV4dCA9IGRtX2FsbG9jKHNpemVvZigqZGMtPmN1cnJlbnRfY29udGV4dCkpOwog CWRjLT50ZW1wX2ZsaXBfY29udGV4dCA9IGRtX2FsbG9jKHNpemVvZigqZGMtPnRlbXBfZmxpcF9j b250ZXh0KSk7Ci0JZGMtPnNjcmF0Y2hfdmFsX2N0eCA9IGRtX2FsbG9jKHNpemVvZigqZGMtPnRl bXBfZmxpcF9jb250ZXh0KSk7CisJZGMtPnNjcmF0Y2hfdmFsX2N0eCA9IGRtX2FsbG9jKHNpemVv ZigqZGMtPnNjcmF0Y2hfdmFsX2N0eCkpOwogCiAJaWYgKCFkYy0+Y3VycmVudF9jb250ZXh0IHx8 ICFkYy0+dGVtcF9mbGlwX2NvbnRleHQpIHsKIAkJZG1fZXJyb3IoIiVzOiBmYWlsZWQgdG8gY3Jl YXRlIHZhbGlkYXRlIGN0eFxuIiwgX19mdW5jX18pOwpAQCAtMTIyMCw2ICsxMjE5LDcgQEAgYm9v bCBkY19wcmVfdXBkYXRlX3N1cmZhY2VzX3RvX3RhcmdldCgKIAkJCWdvdG8gdW5leHBlY3RlZF9m YWlsOwogCQl9CiAJCXJlc291cmNlX3ZhbGlkYXRlX2N0eF9kZXN0cnVjdChjb250ZXh0KTsKKwkJ QVNTRVJUKGNvcmVfZGMtPnNjcmF0Y2hfdmFsX2N0eCA9PSB0ZW1wX2NvbnRleHQpOwogCQljb3Jl X2RjLT5zY3JhdGNoX3ZhbF9jdHggPSBjb250ZXh0OwogCQljb250ZXh0ID0gdGVtcF9jb250ZXh0 OwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvY29y ZV90eXBlcy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9jb3JlX3R5cGVz LmgKaW5kZXggMDQxOGUzZTAyYzdhLi4zY2Y5YmZiNmRlY2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvY29yZV90eXBlcy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvY29yZV90eXBlcy5oCkBAIC0zMTIsNyArMzEyLDcgQEAg c3RydWN0IHZhbGlkYXRlX2NvbnRleHQgewogCiAJLyogVGhlIG91dHB1dCBmcm9tIEJXIGFuZCBX TSBjYWxjdWxhdGlvbnMuICovCiAJc3RydWN0IGJ3X2NhbGNzX291dHB1dCBid19yZXN1bHRzOwot CS8qIE5vdGU6IHRoaXMgaXMgYSBiaWcgc3RydWN0dXJlLCBkbyAqbm90KiBwdXQgb24gc3RhY2sh ICovCisJLyogTm90ZTogdGhlc2UgYXJlIGJpZyBzdHJ1Y3R1cmVzLCBkbyAqbm90KiBwdXQgb24g c3RhY2shICovCiAJc3RydWN0IGRtX3BwX2Rpc3BsYXlfY29uZmlndXJhdGlvbiBwcF9kaXNwbGF5 X2NmZzsKIH07CiAKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft ZC1nZngK