From: Alex Deucher Subject: [PATCH 003/100] drm/amdgpu: move atom scratch setup into amdgpu_atombios.c Date: Mon, 20 Mar 2017 16:29:13 -0400 Message-ID: <1490041835-11255-4-git-send-email-alexander.deucher@amd.com> References: <1490041835-11255-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: In-Reply-To: <1490041835-11255-1-git-send-email-alexander.deucher-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: Alex Deucher VGhlcmUgd2lsbCBiZSBhIHNsaWdodGx5IGRpZmZlcmVudCB2ZXJzaW9uIGZvciBhdG9tZmlybXdh cmUuCgpSZXZpZXdlZC1ieTogS2VuIFdhbmcgPFFpbmdxaW5nLldhbmdAYW1kLmNvbT4KU2lnbmVk LW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hdG9tYmlvcy5jIHwgMjggKysrKysrKysr KysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0 b21iaW9zLmggfCAgMyArKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZp Y2UuYyAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2F0b20uYyAgICAgICAg ICAgIHwgMjYgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2F0b20uaCAgICAgICAgICAgIHwgIDEgLQogNSBmaWxlcyBjaGFuZ2VkLCAzMiBpbnNl cnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfYXRvbWJpb3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9hdG9tYmlvcy5jCmluZGV4IDU2YTg2ZGQuLmY1MmIxYmYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hdG9tYmlvcy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hdG9tYmlvcy5jCkBAIC0xNzQ4LDMgKzE3NDgsMzEg QEAgdm9pZCBhbWRncHVfYXRvbWJpb3NfY29weV9zd2FwKHU4ICpkc3QsIHU4ICpzcmMsIHU4IG51 bV9ieXRlcywgYm9vbCB0b19sZSkKIAltZW1jcHkoZHN0LCBzcmMsIG51bV9ieXRlcyk7CiAjZW5k aWYKIH0KKworaW50IGFtZGdwdV9hdG9tYmlvc19hbGxvY2F0ZV9mYl9zY3JhdGNoKHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2KQoreworCXN0cnVjdCBhdG9tX2NvbnRleHQgKmN0eCA9IGFkZXYt Pm1vZGVfaW5mby5hdG9tX2NvbnRleHQ7CisJaW50IGluZGV4ID0gR2V0SW5kZXhJbnRvTWFzdGVy VGFibGUoREFUQSwgVlJBTV9Vc2FnZUJ5RmlybXdhcmUpOworCXVpbnQxNl90IGRhdGFfb2Zmc2V0 OworCWludCB1c2FnZV9ieXRlcyA9IDA7CisJc3RydWN0IF9BVE9NX1ZSQU1fVVNBR0VfQllfRklS TVdBUkUgKmZpcm13YXJlX3VzYWdlOworCisJaWYgKGFtZGdwdV9hdG9tX3BhcnNlX2RhdGFfaGVh ZGVyKGN0eCwgaW5kZXgsIE5VTEwsIE5VTEwsIE5VTEwsICZkYXRhX29mZnNldCkpIHsKKwkJZmly bXdhcmVfdXNhZ2UgPSAoc3RydWN0IF9BVE9NX1ZSQU1fVVNBR0VfQllfRklSTVdBUkUgKikoY3R4 LT5iaW9zICsgZGF0YV9vZmZzZXQpOworCisJCURSTV9ERUJVRygiYXRvbSBmaXJtd2FyZSByZXF1 ZXN0ZWQgJTA4eCAlZGtiXG4iLAorCQkJICBsZTMyX3RvX2NwdShmaXJtd2FyZV91c2FnZS0+YXNG aXJtd2FyZVZyYW1SZXNlcnZlSW5mb1swXS51bFN0YXJ0QWRkclVzZWRCeUZpcm13YXJlKSwKKwkJ CSAgbGUxNl90b19jcHUoZmlybXdhcmVfdXNhZ2UtPmFzRmlybXdhcmVWcmFtUmVzZXJ2ZUluZm9b MF0udXNGaXJtd2FyZVVzZUluS2IpKTsKKworCQl1c2FnZV9ieXRlcyA9IGxlMTZfdG9fY3B1KGZp cm13YXJlX3VzYWdlLT5hc0Zpcm13YXJlVnJhbVJlc2VydmVJbmZvWzBdLnVzRmlybXdhcmVVc2VJ bktiKSAqIDEwMjQ7CisJfQorCWN0eC0+c2NyYXRjaF9zaXplX2J5dGVzID0gMDsKKwlpZiAodXNh Z2VfYnl0ZXMgPT0gMCkKKwkJdXNhZ2VfYnl0ZXMgPSAyMCAqIDEwMjQ7CisJLyogYWxsb2NhdGUg c29tZSBzY3JhdGNoIG1lbW9yeSAqLworCWN0eC0+c2NyYXRjaCA9IGt6YWxsb2ModXNhZ2VfYnl0 ZXMsIEdGUF9LRVJORUwpOworCWlmICghY3R4LT5zY3JhdGNoKQorCQlyZXR1cm4gLUVOT01FTTsK KwljdHgtPnNjcmF0Y2hfc2l6ZV9ieXRlcyA9IHVzYWdlX2J5dGVzOworCXJldHVybiAwOworfQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0b21iaW9zLmgg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWJpb3MuaAppbmRleCA3MGU5 YWNlLi40ZTBmNDg4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfYXRvbWJpb3MuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRv bWJpb3MuaApAQCAtMjE1LDQgKzIxNSw3IEBAIGludCBhbWRncHVfYXRvbWJpb3NfZ2V0X2Nsb2Nr X2RpdmlkZXJzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogaW50IGFtZGdwdV9hdG9tYmlv c19nZXRfc3ZpMl9pbmZvKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJICAgICAgdTgg dm9sdGFnZV90eXBlLAogCQkJICAgICAgdTggKnN2ZF9ncGlvX2lkLCB1OCAqc3ZjX2dwaW9faWQp OworCitpbnQgYW1kZ3B1X2F0b21iaW9zX2FsbG9jYXRlX2ZiX3NjcmF0Y2goc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpOworCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9kZXZpY2UuYwppbmRleCAxMThmNGU2Li5mODdjMWNiIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCkBAIC05OTMsNyArOTkzLDcgQEAgc3RhdGljIGlu dCBhbWRncHVfYXRvbWJpb3NfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAogCW11 dGV4X2luaXQoJmFkZXYtPm1vZGVfaW5mby5hdG9tX2NvbnRleHQtPm11dGV4KTsKIAlhbWRncHVf YXRvbWJpb3Nfc2NyYXRjaF9yZWdzX2luaXQoYWRldik7Ci0JYW1kZ3B1X2F0b21fYWxsb2NhdGVf ZmJfc2NyYXRjaChhZGV2LT5tb2RlX2luZm8uYXRvbV9jb250ZXh0KTsKKwlhbWRncHVfYXRvbWJp b3NfYWxsb2NhdGVfZmJfc2NyYXRjaChhZGV2KTsKIAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYXRvbS5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYXRvbS5jCmluZGV4IDgxYzYwYTIuLmQ2OWFhMmUgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2F0b20uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hdG9tLmMKQEAgLTE0MTcsMjkgKzE0MTcsMyBAQCBib29sIGFtZGdwdV9hdG9tX3BhcnNl X2NtZF9oZWFkZXIoc3RydWN0IGF0b21fY29udGV4dCAqY3R4LCBpbnQgaW5kZXgsIHVpbnQ4X3Qg KgogCXJldHVybiB0cnVlOwogfQogCi1pbnQgYW1kZ3B1X2F0b21fYWxsb2NhdGVfZmJfc2NyYXRj aChzdHJ1Y3QgYXRvbV9jb250ZXh0ICpjdHgpCi17Ci0JaW50IGluZGV4ID0gR2V0SW5kZXhJbnRv TWFzdGVyVGFibGUoREFUQSwgVlJBTV9Vc2FnZUJ5RmlybXdhcmUpOwotCXVpbnQxNl90IGRhdGFf b2Zmc2V0OwotCWludCB1c2FnZV9ieXRlcyA9IDA7Ci0Jc3RydWN0IF9BVE9NX1ZSQU1fVVNBR0Vf QllfRklSTVdBUkUgKmZpcm13YXJlX3VzYWdlOwotCi0JaWYgKGFtZGdwdV9hdG9tX3BhcnNlX2Rh dGFfaGVhZGVyKGN0eCwgaW5kZXgsIE5VTEwsIE5VTEwsIE5VTEwsICZkYXRhX29mZnNldCkpIHsK LQkJZmlybXdhcmVfdXNhZ2UgPSAoc3RydWN0IF9BVE9NX1ZSQU1fVVNBR0VfQllfRklSTVdBUkUg KikoY3R4LT5iaW9zICsgZGF0YV9vZmZzZXQpOwotCi0JCURSTV9ERUJVRygiYXRvbSBmaXJtd2Fy ZSByZXF1ZXN0ZWQgJTA4eCAlZGtiXG4iLAotCQkJICBsZTMyX3RvX2NwdShmaXJtd2FyZV91c2Fn ZS0+YXNGaXJtd2FyZVZyYW1SZXNlcnZlSW5mb1swXS51bFN0YXJ0QWRkclVzZWRCeUZpcm13YXJl KSwKLQkJCSAgbGUxNl90b19jcHUoZmlybXdhcmVfdXNhZ2UtPmFzRmlybXdhcmVWcmFtUmVzZXJ2 ZUluZm9bMF0udXNGaXJtd2FyZVVzZUluS2IpKTsKLQotCQl1c2FnZV9ieXRlcyA9IGxlMTZfdG9f Y3B1KGZpcm13YXJlX3VzYWdlLT5hc0Zpcm13YXJlVnJhbVJlc2VydmVJbmZvWzBdLnVzRmlybXdh cmVVc2VJbktiKSAqIDEwMjQ7Ci0JfQotCWN0eC0+c2NyYXRjaF9zaXplX2J5dGVzID0gMDsKLQlp ZiAodXNhZ2VfYnl0ZXMgPT0gMCkKLQkJdXNhZ2VfYnl0ZXMgPSAyMCAqIDEwMjQ7Ci0JLyogYWxs b2NhdGUgc29tZSBzY3JhdGNoIG1lbW9yeSAqLwotCWN0eC0+c2NyYXRjaCA9IGt6YWxsb2ModXNh Z2VfYnl0ZXMsIEdGUF9LRVJORUwpOwotCWlmICghY3R4LT5zY3JhdGNoKQotCQlyZXR1cm4gLUVO T01FTTsKLQljdHgtPnNjcmF0Y2hfc2l6ZV9ieXRlcyA9IHVzYWdlX2J5dGVzOwotCXJldHVybiAw OwotfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYXRvbS5oIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYXRvbS5oCmluZGV4IGJhYTI0MzguLmRkZDgwNDUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2F0b20uaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hdG9tLmgKQEAgLTE1Miw3ICsxNTIsNiBAQCBib29sIGFtZGdw dV9hdG9tX3BhcnNlX2RhdGFfaGVhZGVyKHN0cnVjdCBhdG9tX2NvbnRleHQgKmN0eCwgaW50IGlu ZGV4LCB1aW50MTZfdAogCQkJICAgIHVpbnQ4X3QgKmZyZXYsIHVpbnQ4X3QgKmNyZXYsIHVpbnQx Nl90ICpkYXRhX3N0YXJ0KTsKIGJvb2wgYW1kZ3B1X2F0b21fcGFyc2VfY21kX2hlYWRlcihzdHJ1 Y3QgYXRvbV9jb250ZXh0ICpjdHgsIGludCBpbmRleCwKIAkJCSAgIHVpbnQ4X3QgKmZyZXYsIHVp bnQ4X3QgKmNyZXYpOwotaW50IGFtZGdwdV9hdG9tX2FsbG9jYXRlX2ZiX3NjcmF0Y2goc3RydWN0 IGF0b21fY29udGV4dCAqY3R4KTsKICNpbmNsdWRlICJhdG9tLXR5cGVzLmgiCiAjaW5jbHVkZSAi YXRvbWJpb3MuaCIKICNpbmNsdWRlICJPYmplY3RJRC5oIgotLSAKMi41LjUKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0 CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=