From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH] drm/amdgpu: remove support for reserved VMIDs Date: Thu, 31 Aug 2017 16:23:55 +0200 Message-ID: <1504189435-9459-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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, david1.zhou-5C7GfCeVMHo@public.gmane.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKRGF2aWQg cGxlYXNlIHByb3ZpZGUgYW4gb3BlbiBzb3VyY2UgdXNlciwgb3RoZXJ3aXNlCndlIG5lZWQgdG8g cmVtb3ZlIHRoaXMgYWdhaW4uCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJp c3RpYW4ua29lbmlnQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X3ZtLmMgfCAxNDIgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDE0MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV92bS5jCmluZGV4IGQwOWI4YTcuLjEzNTRhMDkgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jCkBAIC0zODcsNzEgKzM4Nyw2IEBAIHN0YXRpYyBi b29sIGFtZGdwdV92bV9oYWRfZ3B1X3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAog CQlhdG9taWNfcmVhZCgmYWRldi0+Z3B1X3Jlc2V0X2NvdW50ZXIpOwogfQogCi1zdGF0aWMgYm9v bCBhbWRncHVfdm1fcmVzZXJ2ZWRfdm1pZF9yZWFkeShzdHJ1Y3QgYW1kZ3B1X3ZtICp2bSwgdW5z aWduZWQgdm1odWIpCi17Ci0JcmV0dXJuICEhdm0tPnJlc2VydmVkX3ZtaWRbdm1odWJdOwotfQot Ci0vKiBpZHJfbWdyLT5sb2NrIG11c3QgYmUgaGVsZCAqLwotc3RhdGljIGludCBhbWRncHVfdm1f Z3JhYl9yZXNlcnZlZF92bWlkX2xvY2tlZChzdHJ1Y3QgYW1kZ3B1X3ZtICp2bSwKLQkJCQkJICAg ICAgIHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywKLQkJCQkJICAgICAgIHN0cnVjdCBhbWRncHVf c3luYyAqc3luYywKLQkJCQkJICAgICAgIHN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlLAotCQkJCQkg ICAgICAgc3RydWN0IGFtZGdwdV9qb2IgKmpvYikKLXsKLQlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiA9IHJpbmctPmFkZXY7Ci0JdW5zaWduZWQgdm1odWIgPSByaW5nLT5mdW5jcy0+dm1odWI7 Ci0JdWludDY0X3QgZmVuY2VfY29udGV4dCA9IGFkZXYtPmZlbmNlX2NvbnRleHQgKyByaW5nLT5p ZHg7Ci0Jc3RydWN0IGFtZGdwdV92bV9pZCAqaWQgPSB2bS0+cmVzZXJ2ZWRfdm1pZFt2bWh1Yl07 Ci0Jc3RydWN0IGFtZGdwdV92bV9pZF9tYW5hZ2VyICppZF9tZ3IgPSAmYWRldi0+dm1fbWFuYWdl ci5pZF9tZ3Jbdm1odWJdOwotCXN0cnVjdCBkbWFfZmVuY2UgKnVwZGF0ZXMgPSBzeW5jLT5sYXN0 X3ZtX3VwZGF0ZTsKLQlpbnQgciA9IDA7Ci0Jc3RydWN0IGRtYV9mZW5jZSAqZmx1c2hlZCwgKnRt cDsKLQlib29sIG5lZWRzX2ZsdXNoID0gdm0tPnVzZV9jcHVfZm9yX3VwZGF0ZTsKLQotCWZsdXNo ZWQgID0gaWQtPmZsdXNoZWRfdXBkYXRlczsKLQlpZiAoKGFtZGdwdV92bV9oYWRfZ3B1X3Jlc2V0 KGFkZXYsIGlkKSkgfHwKLQkgICAgKGF0b21pYzY0X3JlYWQoJmlkLT5vd25lcikgIT0gdm0tPmNs aWVudF9pZCkgfHwKLQkgICAgKGpvYi0+dm1fcGRfYWRkciAhPSBpZC0+cGRfZ3B1X2FkZHIpIHx8 Ci0JICAgICh1cGRhdGVzICYmICghZmx1c2hlZCB8fCB1cGRhdGVzLT5jb250ZXh0ICE9IGZsdXNo ZWQtPmNvbnRleHQgfHwKLQkJCWRtYV9mZW5jZV9pc19sYXRlcih1cGRhdGVzLCBmbHVzaGVkKSkp IHx8Ci0JICAgICghaWQtPmxhc3RfZmx1c2ggfHwgKGlkLT5sYXN0X2ZsdXNoLT5jb250ZXh0ICE9 IGZlbmNlX2NvbnRleHQgJiYKLQkJCQkgIWRtYV9mZW5jZV9pc19zaWduYWxlZChpZC0+bGFzdF9m bHVzaCkpKSkgewotCQluZWVkc19mbHVzaCA9IHRydWU7Ci0JCS8qIHRvIHByZXZlbnQgb25lIGNv bnRleHQgc3RhcnZlZCBieSBhbm90aGVyIGNvbnRleHQgKi8KLQkJaWQtPnBkX2dwdV9hZGRyID0g MDsKLQkJdG1wID0gYW1kZ3B1X3N5bmNfcGVla19mZW5jZSgmaWQtPmFjdGl2ZSwgcmluZyk7Ci0J CWlmICh0bXApIHsKLQkJCXIgPSBhbWRncHVfc3luY19mZW5jZShhZGV2LCBzeW5jLCB0bXApOwot CQkJcmV0dXJuIHI7Ci0JCX0KLQl9Ci0KLQkvKiBHb29kIHdlIGNhbiB1c2UgdGhpcyBWTUlELiBS ZW1lbWJlciB0aGlzIHN1Ym1pc3Npb24gYXMKLQkqIHVzZXIgb2YgdGhlIFZNSUQuCi0JKi8KLQly ID0gYW1kZ3B1X3N5bmNfZmVuY2UocmluZy0+YWRldiwgJmlkLT5hY3RpdmUsIGZlbmNlKTsKLQlp ZiAocikKLQkJZ290byBvdXQ7Ci0KLQlpZiAodXBkYXRlcyAmJiAoIWZsdXNoZWQgfHwgdXBkYXRl cy0+Y29udGV4dCAhPSBmbHVzaGVkLT5jb250ZXh0IHx8Ci0JCQlkbWFfZmVuY2VfaXNfbGF0ZXIo dXBkYXRlcywgZmx1c2hlZCkpKSB7Ci0JCWRtYV9mZW5jZV9wdXQoaWQtPmZsdXNoZWRfdXBkYXRl cyk7Ci0JCWlkLT5mbHVzaGVkX3VwZGF0ZXMgPSBkbWFfZmVuY2VfZ2V0KHVwZGF0ZXMpOwotCX0K LQlpZC0+cGRfZ3B1X2FkZHIgPSBqb2ItPnZtX3BkX2FkZHI7Ci0JYXRvbWljNjRfc2V0KCZpZC0+ b3duZXIsIHZtLT5jbGllbnRfaWQpOwotCWpvYi0+dm1fbmVlZHNfZmx1c2ggPSBuZWVkc19mbHVz aDsKLQlpZiAobmVlZHNfZmx1c2gpIHsKLQkJZG1hX2ZlbmNlX3B1dChpZC0+bGFzdF9mbHVzaCk7 Ci0JCWlkLT5sYXN0X2ZsdXNoID0gTlVMTDsKLQl9Ci0Jam9iLT52bV9pZCA9IGlkIC0gaWRfbWdy LT5pZHM7Ci0JdHJhY2VfYW1kZ3B1X3ZtX2dyYWJfaWQodm0sIHJpbmcsIGpvYik7Ci1vdXQ6Ci0J cmV0dXJuIHI7Ci19Ci0KIC8qKgogICogYW1kZ3B1X3ZtX2dyYWJfaWQgLSBhbGxvY2F0ZSB0aGUg bmV4dCBmcmVlIFZNSUQKICAqCkBAIC00NzcsMTEgKzQxMiw2IEBAIGludCBhbWRncHVfdm1fZ3Jh Yl9pZChzdHJ1Y3QgYW1kZ3B1X3ZtICp2bSwgc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCWlu dCByID0gMDsKIAogCW11dGV4X2xvY2soJmlkX21nci0+bG9jayk7Ci0JaWYgKGFtZGdwdV92bV9y ZXNlcnZlZF92bWlkX3JlYWR5KHZtLCB2bWh1YikpIHsKLQkJciA9IGFtZGdwdV92bV9ncmFiX3Jl c2VydmVkX3ZtaWRfbG9ja2VkKHZtLCByaW5nLCBzeW5jLCBmZW5jZSwgam9iKTsKLQkJbXV0ZXhf dW5sb2NrKCZpZF9tZ3ItPmxvY2spOwotCQlyZXR1cm4gcjsKLQl9CiAJZmVuY2VzID0ga21hbGxv Y19hcnJheShzaXplb2Yodm9pZCAqKSwgaWRfbWdyLT5udW1faWRzLCBHRlBfS0VSTkVMKTsKIAlp ZiAoIWZlbmNlcykgewogCQltdXRleF91bmxvY2soJmlkX21nci0+bG9jayk7CkBAIC02MDUsNTMg KzUzNSw2IEBAIGludCBhbWRncHVfdm1fZ3JhYl9pZChzdHJ1Y3QgYW1kZ3B1X3ZtICp2bSwgc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCXJldHVybiByOwogfQogCi1zdGF0aWMgdm9pZCBhbWRn cHVfdm1fZnJlZV9yZXNlcnZlZF92bWlkKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAotCQkJ CQkgIHN0cnVjdCBhbWRncHVfdm0gKnZtLAotCQkJCQkgIHVuc2lnbmVkIHZtaHViKQotewotCXN0 cnVjdCBhbWRncHVfdm1faWRfbWFuYWdlciAqaWRfbWdyID0gJmFkZXYtPnZtX21hbmFnZXIuaWRf bWdyW3ZtaHViXTsKLQotCW11dGV4X2xvY2soJmlkX21nci0+bG9jayk7Ci0JaWYgKHZtLT5yZXNl cnZlZF92bWlkW3ZtaHViXSkgewotCQlsaXN0X2FkZCgmdm0tPnJlc2VydmVkX3ZtaWRbdm1odWJd LT5saXN0LAotCQkJJmlkX21nci0+aWRzX2xydSk7Ci0JCXZtLT5yZXNlcnZlZF92bWlkW3ZtaHVi XSA9IE5VTEw7Ci0JCWF0b21pY19kZWMoJmlkX21nci0+cmVzZXJ2ZWRfdm1pZF9udW0pOwotCX0K LQltdXRleF91bmxvY2soJmlkX21nci0+bG9jayk7Ci19Ci0KLXN0YXRpYyBpbnQgYW1kZ3B1X3Zt X2FsbG9jX3Jlc2VydmVkX3ZtaWQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCi0JCQkJCSBz dHJ1Y3QgYW1kZ3B1X3ZtICp2bSwKLQkJCQkJIHVuc2lnbmVkIHZtaHViKQotewotCXN0cnVjdCBh bWRncHVfdm1faWRfbWFuYWdlciAqaWRfbWdyOwotCXN0cnVjdCBhbWRncHVfdm1faWQgKmlkbGU7 Ci0JaW50IHIgPSAwOwotCi0JaWRfbWdyID0gJmFkZXYtPnZtX21hbmFnZXIuaWRfbWdyW3ZtaHVi XTsKLQltdXRleF9sb2NrKCZpZF9tZ3ItPmxvY2spOwotCWlmICh2bS0+cmVzZXJ2ZWRfdm1pZFt2 bWh1Yl0pCi0JCWdvdG8gdW5sb2NrOwotCWlmIChhdG9taWNfaW5jX3JldHVybigmaWRfbWdyLT5y ZXNlcnZlZF92bWlkX251bSkgPgotCSAgICBBTURHUFVfVk1fTUFYX1JFU0VSVkVEX1ZNSUQpIHsK LQkJRFJNX0VSUk9SKCJPdmVyIGxpbWl0YXRpb24gb2YgcmVzZXJ2ZWQgdm1pZFxuIik7Ci0JCWF0 b21pY19kZWMoJmlkX21nci0+cmVzZXJ2ZWRfdm1pZF9udW0pOwotCQlyID0gLUVJTlZBTDsKLQkJ Z290byB1bmxvY2s7Ci0JfQotCS8qIFNlbGVjdCB0aGUgZmlyc3QgZW50cnkgVk1JRCAqLwotCWlk bGUgPSBsaXN0X2ZpcnN0X2VudHJ5KCZpZF9tZ3ItPmlkc19scnUsIHN0cnVjdCBhbWRncHVfdm1f aWQsIGxpc3QpOwotCWxpc3RfZGVsX2luaXQoJmlkbGUtPmxpc3QpOwotCXZtLT5yZXNlcnZlZF92 bWlkW3ZtaHViXSA9IGlkbGU7Ci0JbXV0ZXhfdW5sb2NrKCZpZF9tZ3ItPmxvY2spOwotCi0JcmV0 dXJuIDA7Ci11bmxvY2s6Ci0JbXV0ZXhfdW5sb2NrKCZpZF9tZ3ItPmxvY2spOwotCXJldHVybiBy OwotfQotCiAvKioKICAqIGFtZGdwdV92bV9jaGVja19jb21wdXRlX2J1ZyAtIGNoZWNrIHdoZXRo ZXIgYXNpYyBoYXMgY29tcHV0ZSB2bSBidWcKICAqCkBAIC0yNjUwLDcgKzI1MzMsNiBAQCB2b2lk IGFtZGdwdV92bV9maW5pKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBzdHJ1Y3QgYW1kZ3B1 X3ZtICp2bSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2JvX3ZhX21hcHBpbmcgKm1hcHBpbmcsICp0bXA7 CiAJYm9vbCBwcnRfZmluaV9uZWVkZWQgPSAhIWFkZXYtPmdhcnQuZ2FydF9mdW5jcy0+c2V0X3By dDsKLQlpbnQgaTsKIAogCWFtZF9zY2hlZF9lbnRpdHlfZmluaSh2bS0+ZW50aXR5LnNjaGVkLCAm dm0tPmVudGl0eSk7CiAKQEAgLTI2NzQsOCArMjU1Niw2IEBAIHZvaWQgYW1kZ3B1X3ZtX2Zpbmko c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHN0cnVjdCBhbWRncHVfdm0gKnZtKQogCiAJYW1k Z3B1X3ZtX2ZyZWVfbGV2ZWxzKCZ2bS0+cm9vdCk7CiAJZG1hX2ZlbmNlX3B1dCh2bS0+bGFzdF9k aXJfdXBkYXRlKTsKLQlmb3IgKGkgPSAwOyBpIDwgQU1ER1BVX01BWF9WTUhVQlM7IGkrKykKLQkJ YW1kZ3B1X3ZtX2ZyZWVfcmVzZXJ2ZWRfdm1pZChhZGV2LCB2bSwgaSk7CiB9CiAKIC8qKgpAQCAt Mjc2MSwyNSArMjY0MSw1IEBAIHZvaWQgYW1kZ3B1X3ZtX21hbmFnZXJfZmluaShzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldikKIAogaW50IGFtZGdwdV92bV9pb2N0bChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHApCiB7Ci0JdW5pb24gZHJt X2FtZGdwdV92bSAqYXJncyA9IGRhdGE7Ci0Jc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBk ZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBhbWRncHVfZnByaXYgKmZwcml2ID0gZmlscC0+ZHJp dmVyX3ByaXY7Ci0JaW50IHI7Ci0KLQlzd2l0Y2ggKGFyZ3MtPmluLm9wKSB7Ci0JY2FzZSBBTURH UFVfVk1fT1BfUkVTRVJWRV9WTUlEOgotCQkvKiBjdXJyZW50LCB3ZSBvbmx5IGhhdmUgcmVxdWly ZW1lbnQgdG8gcmVzZXJ2ZSB2bWlkIGZyb20gZ2Z4aHViICovCi0JCXIgPSBhbWRncHVfdm1fYWxs b2NfcmVzZXJ2ZWRfdm1pZChhZGV2LCAmZnByaXYtPnZtLAotCQkJCQkJICBBTURHUFVfR0ZYSFVC KTsKLQkJaWYgKHIpCi0JCQlyZXR1cm4gcjsKLQkJYnJlYWs7Ci0JY2FzZSBBTURHUFVfVk1fT1Bf VU5SRVNFUlZFX1ZNSUQ6Ci0JCWFtZGdwdV92bV9mcmVlX3Jlc2VydmVkX3ZtaWQoYWRldiwgJmZw cml2LT52bSwgQU1ER1BVX0dGWEhVQik7Ci0JCWJyZWFrOwotCWRlZmF1bHQ6Ci0JCXJldHVybiAt RUlOVkFMOwotCX0KLQotCXJldHVybiAwOworCXJldHVybiAtRUlOVkFMOwogfQotLSAKMi43LjQK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZngg bWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=