From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 5/6] drm/amdgpu: enable amdgpu_move_blit to handle multiple MM nodes v2 Date: Tue, 27 Sep 2016 11:49:56 +0200 Message-ID: <1474969797-1882-6-git-send-email-deathsimple@vodafone.de> References: <1474969797-1882-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1474969797-1882-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhpcyBh bGxvd3MgdXMgdG8gbW92ZSBzY2F0dGVyZWQgYnVmZmVycyBhcm91bmQuCgp2MjogZml4IGEgY291 cGxlIG9mIHR5cG9zLCBoYW5kbGUgc2NhdHRlcmVkIHRvIHNjYXR0ZXJlZCBtb3ZlcyBhcyB3ZWxs LgoKU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYyB8IDExOCAr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDg1IGluc2Vy dGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV90dG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV90dG0uYwppbmRleCAwNmFiNjI0Li5iZDM3N2Q4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X3R0bS5jCkBAIC0yNTksNjQgKzI1OSwxMTYgQEAgc3RhdGljIHZvaWQgYW1kZ3B1 X21vdmVfbnVsbChzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvLAogCW5ld19tZW0tPm1tX25v ZGUgPSBOVUxMOwogfQogCi1zdGF0aWMgaW50IGFtZGdwdV9tb3ZlX2JsaXQoc3RydWN0IHR0bV9i dWZmZXJfb2JqZWN0ICpibywKLQkJCWJvb2wgZXZpY3QsIGJvb2wgbm9fd2FpdF9ncHUsCi0JCQlz dHJ1Y3QgdHRtX21lbV9yZWcgKm5ld19tZW0sCi0JCQlzdHJ1Y3QgdHRtX21lbV9yZWcgKm9sZF9t ZW0pCitzdGF0aWMgaW50IGFtZGdwdV9tbV9ub2RlX2FkZHIoc3RydWN0IHR0bV9idWZmZXJfb2Jq ZWN0ICpibywKKwkJCSAgICAgICBzdHJ1Y3QgZHJtX21tX25vZGUgKm1tX25vZGUsCisJCQkgICAg ICAgc3RydWN0IHR0bV9tZW1fcmVnICptZW0sCisJCQkgICAgICAgdWludDY0X3QgKmFkZHIpCiB7 Ci0Jc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXY7Ci0Jc3RydWN0IGFtZGdwdV9yaW5nICpyaW5n OwotCXVpbnQ2NF90IG9sZF9zdGFydCwgbmV3X3N0YXJ0OwotCXN0cnVjdCBmZW5jZSAqZmVuY2U7 CiAJaW50IHI7CiAKLQlhZGV2ID0gYW1kZ3B1X2dldF9hZGV2KGJvLT5iZGV2KTsKLQlyaW5nID0g YWRldi0+bW1hbi5idWZmZXJfZnVuY3NfcmluZzsKLQotCXN3aXRjaCAob2xkX21lbS0+bWVtX3R5 cGUpIHsKKwlzd2l0Y2ggKG1lbS0+bWVtX3R5cGUpIHsKIAljYXNlIFRUTV9QTF9UVDoKLQkJciA9 IGFtZGdwdV90dG1fYmluZChibywgb2xkX21lbSk7CisJCXIgPSBhbWRncHVfdHRtX2JpbmQoYm8s IG1lbSk7CiAJCWlmIChyKQogCQkJcmV0dXJuIHI7CiAKIAljYXNlIFRUTV9QTF9WUkFNOgotCQlv bGRfc3RhcnQgPSAodTY0KW9sZF9tZW0tPnN0YXJ0IDw8IFBBR0VfU0hJRlQ7Ci0JCW9sZF9zdGFy dCArPSBiby0+YmRldi0+bWFuW29sZF9tZW0tPm1lbV90eXBlXS5ncHVfb2Zmc2V0OworCQkqYWRk ciA9IG1tX25vZGUtPnN0YXJ0IDw8IFBBR0VfU0hJRlQ7CisJCSphZGRyICs9IGJvLT5iZGV2LT5t YW5bbWVtLT5tZW1fdHlwZV0uZ3B1X29mZnNldDsKIAkJYnJlYWs7CiAJZGVmYXVsdDoKLQkJRFJN X0VSUk9SKCJVbmtub3duIHBsYWNlbWVudCAlZFxuIiwgb2xkX21lbS0+bWVtX3R5cGUpOworCQlE Uk1fRVJST1IoIlVua25vd24gcGxhY2VtZW50ICVkXG4iLCBtZW0tPm1lbV90eXBlKTsKIAkJcmV0 dXJuIC1FSU5WQUw7CiAJfQotCXN3aXRjaCAobmV3X21lbS0+bWVtX3R5cGUpIHsKLQljYXNlIFRU TV9QTF9UVDoKLQkJciA9IGFtZGdwdV90dG1fYmluZChibywgbmV3X21lbSk7Ci0JCWlmIChyKQot CQkJcmV0dXJuIHI7CiAKLQljYXNlIFRUTV9QTF9WUkFNOgotCQluZXdfc3RhcnQgPSAodTY0KW5l d19tZW0tPnN0YXJ0IDw8IFBBR0VfU0hJRlQ7Ci0JCW5ld19zdGFydCArPSBiby0+YmRldi0+bWFu W25ld19tZW0tPm1lbV90eXBlXS5ncHVfb2Zmc2V0OwotCQlicmVhazsKLQlkZWZhdWx0OgotCQlE Uk1fRVJST1IoIlVua25vd24gcGxhY2VtZW50ICVkXG4iLCBvbGRfbWVtLT5tZW1fdHlwZSk7Ci0J CXJldHVybiAtRUlOVkFMOwotCX0KKwlyZXR1cm4gMDsKK30KKworc3RhdGljIGludCBhbWRncHVf bW92ZV9ibGl0KHN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8sCisJCQkgICAgYm9vbCBldmlj dCwgYm9vbCBub193YWl0X2dwdSwKKwkJCSAgICBzdHJ1Y3QgdHRtX21lbV9yZWcgKm5ld19tZW0s CisJCQkgICAgc3RydWN0IHR0bV9tZW1fcmVnICpvbGRfbWVtKQoreworCXN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2ID0gYW1kZ3B1X2dldF9hZGV2KGJvLT5iZGV2KTsKKwlzdHJ1Y3QgYW1kZ3B1 X3JpbmcgKnJpbmcgPSBhZGV2LT5tbWFuLmJ1ZmZlcl9mdW5jc19yaW5nOworCisJc3RydWN0IGRy bV9tbV9ub2RlICpvbGRfbW0sICpuZXdfbW07CisJdWludDY0X3Qgb2xkX3N0YXJ0LCBvbGRfc2l6 ZSwgbmV3X3N0YXJ0LCBuZXdfc2l6ZTsKKwl1bnNpZ25lZCBsb25nIG51bV9wYWdlczsKKwlzdHJ1 Y3QgZmVuY2UgKmZlbmNlID0gTlVMTDsKKwlpbnQgcjsKKworCUJVSUxEX0JVR19PTigoUEFHRV9T SVpFICUgQU1ER1BVX0dQVV9QQUdFX1NJWkUpICE9IDApOworCiAJaWYgKCFyaW5nLT5yZWFkeSkg ewogCQlEUk1fRVJST1IoIlRyeWluZyB0byBtb3ZlIG1lbW9yeSB3aXRoIHJpbmcgdHVybmVkIG9m Zi5cbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlCVUlMRF9CVUdfT04oKFBBR0VfU0la RSAlIEFNREdQVV9HUFVfUEFHRV9TSVpFKSAhPSAwKTsKKwlvbGRfbW0gPSBvbGRfbWVtLT5tbV9u b2RlOworCXIgPSBhbWRncHVfbW1fbm9kZV9hZGRyKGJvLCBvbGRfbW0sIG9sZF9tZW0sICZvbGRf c3RhcnQpOworCWlmIChyKQorCQlyZXR1cm4gcjsKKwlvbGRfc2l6ZSA9IG9sZF9tbS0+c2l6ZTsK KwogCi0JciA9IGFtZGdwdV9jb3B5X2J1ZmZlcihyaW5nLCBvbGRfc3RhcnQsIG5ld19zdGFydCwK LQkJCSAgICAgICBuZXdfbWVtLT5udW1fcGFnZXMgKiBQQUdFX1NJWkUsIC8qIGJ5dGVzICovCi0J CQkgICAgICAgYm8tPnJlc3YsICZmZW5jZSwgZmFsc2UpOworCW5ld19tbSA9IG5ld19tZW0tPm1t X25vZGU7CisJciA9IGFtZGdwdV9tbV9ub2RlX2FkZHIoYm8sIG5ld19tbSwgbmV3X21lbSwgJm5l d19zdGFydCk7CiAJaWYgKHIpCiAJCXJldHVybiByOworCW5ld19zaXplID0gbmV3X21tLT5zaXpl OworCisJbnVtX3BhZ2VzID0gbmV3X21lbS0+bnVtX3BhZ2VzOworCXdoaWxlIChudW1fcGFnZXMp IHsKKwkJdW5zaWduZWQgbG9uZyBjdXJfcGFnZXMgPSBtaW4ob2xkX3NpemUsIG5ld19zaXplKTsK KwkJc3RydWN0IGZlbmNlICpuZXh0OworCisJCXIgPSBhbWRncHVfY29weV9idWZmZXIocmluZywg b2xkX3N0YXJ0LCBuZXdfc3RhcnQsCisJCQkJICAgICAgIGN1cl9wYWdlcyAqIFBBR0VfU0laRSwK KwkJCQkgICAgICAgYm8tPnJlc3YsICZuZXh0LCBmYWxzZSk7CisJCWlmIChyKQorCQkJZ290byBl cnJvcjsKKworCQlmZW5jZV9wdXQoZmVuY2UpOworCQlmZW5jZSA9IG5leHQ7CisKKwkJbnVtX3Bh Z2VzIC09IGN1cl9wYWdlczsKKwkJaWYgKCFudW1fcGFnZXMpCisJCQlicmVhazsKKworCQlvbGRf c2l6ZSAtPSBjdXJfcGFnZXM7CisJCWlmICghb2xkX3NpemUpIHsKKwkJCXIgPSBhbWRncHVfbW1f bm9kZV9hZGRyKGJvLCArK29sZF9tbSwgb2xkX21lbSwKKwkJCQkJCSZvbGRfc3RhcnQpOworCQkJ aWYgKHIpCisJCQkJZ290byBlcnJvcjsKKwkJCW9sZF9zaXplID0gb2xkX21tLT5zaXplOworCQl9 IGVsc2UgeworCQkJb2xkX3N0YXJ0ICs9IGN1cl9wYWdlcyAqIFBBR0VfU0laRTsKKwkJfQorCisJ CW5ld19zaXplIC09IGN1cl9wYWdlczsKKwkJaWYgKCFuZXdfc2l6ZSkgeworCQkJciA9IGFtZGdw dV9tbV9ub2RlX2FkZHIoYm8sICsrbmV3X21tLCBuZXdfbWVtLAorCQkJCQkJJm5ld19zdGFydCk7 CisJCQlpZiAocikKKwkJCQlnb3RvIGVycm9yOworCisJCQluZXdfc2l6ZSA9IG5ld19tbS0+c2l6 ZTsKKwkJfSBlbHNlIHsKKwkJCW5ld19zdGFydCArPSBjdXJfcGFnZXMgKiBQQUdFX1NJWkU7CisJ CX0KKwl9CiAKIAlyID0gdHRtX2JvX3BpcGVsaW5lX21vdmUoYm8sIGZlbmNlLCBldmljdCwgbmV3 X21lbSk7CiAJZmVuY2VfcHV0KGZlbmNlKTsKIAlyZXR1cm4gcjsKKworZXJyb3I6CisJaWYgKGZl bmNlKQorCQlmZW5jZV93YWl0KGZlbmNlLCBmYWxzZSk7CisJZmVuY2VfcHV0KGZlbmNlKTsKKwly ZXR1cm4gcjsKIH0KIAogc3RhdGljIGludCBhbWRncHVfbW92ZV92cmFtX3JhbShzdHJ1Y3QgdHRt X2J1ZmZlcl9vYmplY3QgKmJvLAotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vYW1kLWdmeAo=