From mboxrd@z Thu Jan 1 00:00:00 1970 From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" Subject: [PATCH 2/2] drm/amdgpu: cleanup VCN IB generation Date: Wed, 7 Feb 2018 20:48:22 +0100 Message-ID: <20180207194822.7878-2-christian.koenig@amd.com> References: <20180207194822.7878-1-christian.koenig@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180207194822.7878-1-christian.koenig-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 U3RhcnQgdG8gdXNlIGFtZGdwdV9ib19jcmVhdGVfcmVzZXJ2ZWQuCgpTaWduZWQtb2ZmLWJ5OiBD aHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Zjbi5jIHwgOTEgKysrKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgNzAgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Zj bi5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Zjbi5jCmluZGV4IGU4NmQw YjJlOWI3YS4uOTdiZGRlOWE3MzllIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfdmNuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3Zjbi5jCkBAIC0yNzAsNDMgKzI3MCwyOCBAQCBpbnQgYW1kZ3B1X3Zjbl9kZWNfcmluZ190ZXN0 X3Jpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogCXJldHVybiByOwogfQogCi1zdGF0aWMg aW50IGFtZGdwdV92Y25fZGVjX3NlbmRfbXNnKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywgc3Ry dWN0IGFtZGdwdV9ibyAqYm8sCi0JCQkgICAgICAgYm9vbCBkaXJlY3QsIHN0cnVjdCBkbWFfZmVu Y2UgKipmZW5jZSkKK3N0YXRpYyBpbnQgYW1kZ3B1X3Zjbl9kZWNfc2VuZF9tc2coc3RydWN0IGFt ZGdwdV9yaW5nICpyaW5nLAorCQkJCSAgIHN0cnVjdCBhbWRncHVfYm8gKmJvLCBib29sIGRpcmVj dCwKKwkJCQkgICBzdHJ1Y3QgZG1hX2ZlbmNlICoqZmVuY2UpCiB7Ci0Jc3RydWN0IHR0bV9vcGVy YXRpb25fY3R4IGN0eCA9IHsgdHJ1ZSwgZmFsc2UgfTsKLQlzdHJ1Y3QgdHRtX3ZhbGlkYXRlX2J1 ZmZlciB0djsKLQlzdHJ1Y3Qgd3dfYWNxdWlyZV9jdHggdGlja2V0OwotCXN0cnVjdCBsaXN0X2hl YWQgaGVhZDsKKwlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHJpbmctPmFkZXY7CisJc3Ry dWN0IGRtYV9mZW5jZSAqZiA9IE5VTEw7CiAJc3RydWN0IGFtZGdwdV9qb2IgKmpvYjsKIAlzdHJ1 Y3QgYW1kZ3B1X2liICppYjsKLQlzdHJ1Y3QgZG1hX2ZlbmNlICpmID0gTlVMTDsKLQlzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiA9IHJpbmctPmFkZXY7CiAJdWludDY0X3QgYWRkcjsKIAlpbnQg aSwgcjsKIAotCW1lbXNldCgmdHYsIDAsIHNpemVvZih0dikpOwotCXR2LmJvID0gJmJvLT50Ym87 Ci0KLQlJTklUX0xJU1RfSEVBRCgmaGVhZCk7Ci0JbGlzdF9hZGQoJnR2LmhlYWQsICZoZWFkKTsK LQotCXIgPSB0dG1fZXVfcmVzZXJ2ZV9idWZmZXJzKCZ0aWNrZXQsICZoZWFkLCB0cnVlLCBOVUxM KTsKLQlpZiAocikKLQkJcmV0dXJuIHI7Ci0KLQlyID0gdHRtX2JvX3ZhbGlkYXRlKCZiby0+dGJv LCAmYm8tPnBsYWNlbWVudCwgJmN0eCk7Ci0JaWYgKHIpCi0JCWdvdG8gZXJyOwotCiAJciA9IGFt ZGdwdV9qb2JfYWxsb2Nfd2l0aF9pYihhZGV2LCA2NCwgJmpvYik7CiAJaWYgKHIpCiAJCWdvdG8g ZXJyOwogCiAJaWIgPSAmam9iLT5pYnNbMF07CiAJYWRkciA9IGFtZGdwdV9ib19ncHVfb2Zmc2V0 KGJvKTsKLQlpYi0+cHRyWzBdID0gUEFDS0VUMChTT0MxNV9SRUdfT0ZGU0VUKFVWRCwgMCwgbW1V VkRfR1BDT01fVkNQVV9EQVRBMCksIDApOworCWliLT5wdHJbMF0gPSBQQUNLRVQwKFNPQzE1X1JF R19PRkZTRVQoVVZELCAwLCBtbVVWRF9HUENPTV9WQ1BVX0RBVEEwKSwKKwkJCSAgICAgMCk7CiAJ aWItPnB0clsxXSA9IGFkZHI7Ci0JaWItPnB0clsyXSA9IFBBQ0tFVDAoU09DMTVfUkVHX09GRlNF VChVVkQsIDAsIG1tVVZEX0dQQ09NX1ZDUFVfREFUQTEpLCAwKTsKKwlpYi0+cHRyWzJdID0gUEFD S0VUMChTT0MxNV9SRUdfT0ZGU0VUKFVWRCwgMCwgbW1VVkRfR1BDT01fVkNQVV9EQVRBMSksCisJ CQkgICAgIDApOwogCWliLT5wdHJbM10gPSBhZGRyID4+IDMyOwogCWliLT5wdHJbNF0gPSBQQUNL RVQwKFNPQzE1X1JFR19PRkZTRVQoVVZELCAwLCBtbVVWRF9HUENPTV9WQ1BVX0NNRCksIDApOwog CWliLT5wdHJbNV0gPSAwOwpAQCAtMzMwLDExICszMTUsMTIgQEAgc3RhdGljIGludCBhbWRncHVf dmNuX2RlY19zZW5kX21zZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHN0cnVjdCBhbWRncHVf Ym8gKmIKIAkJCWdvdG8gZXJyX2ZyZWU7CiAJfQogCi0JdHRtX2V1X2ZlbmNlX2J1ZmZlcl9vYmpl Y3RzKCZ0aWNrZXQsICZoZWFkLCBmKTsKKwlhbWRncHVfYm9fZmVuY2UoYm8sIGYsIGZhbHNlKTsK KwlhbWRncHVfYm9fdW5yZXNlcnZlKGJvKTsKKwlhbWRncHVfYm9fdW5yZWYoJmJvKTsKIAogCWlm IChmZW5jZSkKIAkJKmZlbmNlID0gZG1hX2ZlbmNlX2dldChmKTsKLQlhbWRncHVfYm9fdW5yZWYo JmJvKTsKIAlkbWFfZmVuY2VfcHV0KGYpOwogCiAJcmV0dXJuIDA7CkBAIC0zNDMsNyArMzI5LDgg QEAgc3RhdGljIGludCBhbWRncHVfdmNuX2RlY19zZW5kX21zZyhzdHJ1Y3QgYW1kZ3B1X3Jpbmcg KnJpbmcsIHN0cnVjdCBhbWRncHVfYm8gKmIKIAlhbWRncHVfam9iX2ZyZWUoam9iKTsKIAogZXJy OgotCXR0bV9ldV9iYWNrb2ZmX3Jlc2VydmF0aW9uKCZ0aWNrZXQsICZoZWFkKTsKKwlhbWRncHVf Ym9fdW5yZXNlcnZlKGJvKTsKKwlhbWRncHVfYm9fdW5yZWYoJmJvKTsKIAlyZXR1cm4gcjsKIH0K IApAQCAtMzUxLDMxICszMzgsMTYgQEAgc3RhdGljIGludCBhbWRncHVfdmNuX2RlY19nZXRfY3Jl YXRlX21zZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHVpbnQzMl90IGhhbmQKIAkJCSAgICAg IHN0cnVjdCBkbWFfZmVuY2UgKipmZW5jZSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diA9IHJpbmctPmFkZXY7Ci0Jc3RydWN0IGFtZGdwdV9ibyAqYm87CisJc3RydWN0IGFtZGdwdV9i byAqYm8gPSBOVUxMOwogCXVpbnQzMl90ICptc2c7CiAJaW50IHIsIGk7CiAKLQlyID0gYW1kZ3B1 X2JvX2NyZWF0ZShhZGV2LCAxMDI0LCBQQUdFX1NJWkUsIHRydWUsCi0JCQkgICAgIEFNREdQVV9H RU1fRE9NQUlOX1ZSQU0sCi0JCQkgICAgIEFNREdQVV9HRU1fQ1JFQVRFX0NQVV9BQ0NFU1NfUkVR VUlSRUQgfAotCQkJICAgICBBTURHUFVfR0VNX0NSRUFURV9WUkFNX0NPTlRJR1VPVVMsCi0JCQkg ICAgIE5VTEwsIE5VTEwsICZibyk7CisJciA9IGFtZGdwdV9ib19jcmVhdGVfcmVzZXJ2ZWQoYWRl diwgMTAyNCwgUEFHRV9TSVpFLAorCQkJCSAgICAgIEFNREdQVV9HRU1fRE9NQUlOX1ZSQU0sCisJ CQkJICAgICAgJmJvLCBOVUxMLCAodm9pZCAqKikmbXNnKTsKIAlpZiAocikKIAkJcmV0dXJuIHI7 CiAKLQlyID0gYW1kZ3B1X2JvX3Jlc2VydmUoYm8sIGZhbHNlKTsKLQlpZiAocikgewotCQlhbWRn cHVfYm9fdW5yZWYoJmJvKTsKLQkJcmV0dXJuIHI7Ci0JfQotCi0JciA9IGFtZGdwdV9ib19rbWFw KGJvLCAodm9pZCAqKikmbXNnKTsKLQlpZiAocikgewotCQlhbWRncHVfYm9fdW5yZXNlcnZlKGJv KTsKLQkJYW1kZ3B1X2JvX3VucmVmKCZibyk7Ci0JCXJldHVybiByOwotCX0KLQogCW1zZ1swXSA9 IGNwdV90b19sZTMyKDB4MDAwMDAwMjgpOwogCW1zZ1sxXSA9IGNwdV90b19sZTMyKDB4MDAwMDAw MzgpOwogCW1zZ1syXSA9IGNwdV90b19sZTMyKDB4MDAwMDAwMDEpOwpAQCAtMzkzLDkgKzM2NSw2 IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3Zjbl9kZWNfZ2V0X2NyZWF0ZV9tc2coc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nLCB1aW50MzJfdCBoYW5kCiAJZm9yIChpID0gMTQ7IGkgPCAxMDI0OyArK2kp CiAJCW1zZ1tpXSA9IGNwdV90b19sZTMyKDB4MCk7CiAKLQlhbWRncHVfYm9fa3VubWFwKGJvKTsK LQlhbWRncHVfYm9fdW5yZXNlcnZlKGJvKTsKLQogCXJldHVybiBhbWRncHVfdmNuX2RlY19zZW5k X21zZyhyaW5nLCBibywgdHJ1ZSwgZmVuY2UpOwogfQogCkBAIC00MDcsMjcgKzM3NiwxMiBAQCBz dGF0aWMgaW50IGFtZGdwdV92Y25fZGVjX2dldF9kZXN0cm95X21zZyhzdHJ1Y3QgYW1kZ3B1X3Jp bmcgKnJpbmcsIHVpbnQzMl90IGhhbgogCXVpbnQzMl90ICptc2c7CiAJaW50IHIsIGk7CiAKLQly ID0gYW1kZ3B1X2JvX2NyZWF0ZShhZGV2LCAxMDI0LCBQQUdFX1NJWkUsIHRydWUsCi0JCQkgICAg IEFNREdQVV9HRU1fRE9NQUlOX1ZSQU0sCi0JCQkgICAgIEFNREdQVV9HRU1fQ1JFQVRFX0NQVV9B Q0NFU1NfUkVRVUlSRUQgfAotCQkJICAgICBBTURHUFVfR0VNX0NSRUFURV9WUkFNX0NPTlRJR1VP VVMsCi0JCQkgICAgIE5VTEwsIE5VTEwsICZibyk7CisJciA9IGFtZGdwdV9ib19jcmVhdGVfcmVz ZXJ2ZWQoYWRldiwgMTAyNCwgUEFHRV9TSVpFLAorCQkJCSAgICAgIEFNREdQVV9HRU1fRE9NQUlO X1ZSQU0sCisJCQkJICAgICAgJmJvLCBOVUxMLCAodm9pZCAqKikmbXNnKTsKIAlpZiAocikKIAkJ cmV0dXJuIHI7CiAKLQlyID0gYW1kZ3B1X2JvX3Jlc2VydmUoYm8sIGZhbHNlKTsKLQlpZiAocikg ewotCQlhbWRncHVfYm9fdW5yZWYoJmJvKTsKLQkJcmV0dXJuIHI7Ci0JfQotCi0JciA9IGFtZGdw dV9ib19rbWFwKGJvLCAodm9pZCAqKikmbXNnKTsKLQlpZiAocikgewotCQlhbWRncHVfYm9fdW5y ZXNlcnZlKGJvKTsKLQkJYW1kZ3B1X2JvX3VucmVmKCZibyk7Ci0JCXJldHVybiByOwotCX0KLQog CW1zZ1swXSA9IGNwdV90b19sZTMyKDB4MDAwMDAwMjgpOwogCW1zZ1sxXSA9IGNwdV90b19sZTMy KDB4MDAwMDAwMTgpOwogCW1zZ1syXSA9IGNwdV90b19sZTMyKDB4MDAwMDAwMDApOwpAQCAtNDM3 LDkgKzM5MSw2IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3Zjbl9kZWNfZ2V0X2Rlc3Ryb3lfbXNnKHN0 cnVjdCBhbWRncHVfcmluZyAqcmluZywgdWludDMyX3QgaGFuCiAJZm9yIChpID0gNjsgaSA8IDEw MjQ7ICsraSkKIAkJbXNnW2ldID0gY3B1X3RvX2xlMzIoMHgwKTsKIAotCWFtZGdwdV9ib19rdW5t YXAoYm8pOwotCWFtZGdwdV9ib191bnJlc2VydmUoYm8pOwotCiAJcmV0dXJuIGFtZGdwdV92Y25f ZGVjX3NlbmRfbXNnKHJpbmcsIGJvLCBkaXJlY3QsIGZlbmNlKTsKIH0KIAotLSAKMi4xNC4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1h aWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK