From: Thomas Hellstrom Subject: [PATCH -fixes] drm/vmwgfx: Improve on IOMMU detection Date: Fri, 25 Jan 2019 10:14:53 +0100 Message-ID: <20190125091453.2456-1-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from EX13-EDG-OU-002.vmware.com (ex13-edg-ou-002.vmware.com [208.91.0.190]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1B82C6F2B6 for ; Fri, 25 Jan 2019 09:15:11 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-graphics-maintainer@vmware.com, dri-devel@lists.freedesktop.org Cc: Thomas Hellstrom List-Id: dri-devel@lists.freedesktop.org aW5zdGVhZCBvZiByZWx5aW5nIG9uIGludGVsX2lvbW11X2VuYWJsZWQsIHVzZSB0aGUgZmFjdCB0 aGF0IHRoZQpkbWFfbWFwOm9wczo6bWFwX3BhZ2UgIT0gZG1hX2RpcmVjdF9tYXBfcGFnZS4KClNp Z25lZC1vZmYtYnk6IFRob21hcyBIZWxsc3Ryb20gPHRoZWxsc3Ryb21Adm13YXJlLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYyB8IDIwICsrKysrKysrKysrKysr KysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYyBiL2RyaXZl cnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jCmluZGV4IDNlMmJjZmYzNDAzMi4uNzdmNDIy Y2QxOGFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYwpAQCAtMjYsNiArMjYsNyBA QAogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqLwogI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPgogI2luY2x1 ZGUgPGxpbnV4L2NvbnNvbGUuaD4KKyNpbmNsdWRlIDxsaW51eC9kbWEtbWFwcGluZy5oPgogCiAj aW5jbHVkZSA8ZHJtL2RybVAuaD4KICNpbmNsdWRlICJ2bXdnZnhfZHJ2LmgiCkBAIC0zNCw3ICsz NSw2IEBACiAjaW5jbHVkZSA8ZHJtL3R0bS90dG1fcGxhY2VtZW50Lmg+CiAjaW5jbHVkZSA8ZHJt L3R0bS90dG1fYm9fZHJpdmVyLmg+CiAjaW5jbHVkZSA8ZHJtL3R0bS90dG1fbW9kdWxlLmg+Ci0j aW5jbHVkZSA8bGludXgvaW50ZWwtaW9tbXUuaD4KIAogI2RlZmluZSBWTVdHRlhfRFJJVkVSX0RF U0MgIkxpbnV4IGRybSBkcml2ZXIgZm9yIFZNd2FyZSBncmFwaGljcyBkZXZpY2VzIgogI2RlZmlu ZSBWTVdHRlhfQ0hJUF9TVkdBSUkgMApAQCAtNTQ1LDYgKzU0NSwyMCBAQCBzdGF0aWMgdm9pZCB2 bXdfZ2V0X2luaXRpYWxfc2l6ZShzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2KQogCWRldl9w cml2LT5pbml0aWFsX2hlaWdodCA9IGhlaWdodDsKIH0KIAorLyoqCisgKiB2bXdfYXNzdW1lX2lv bW11IC0gRmlndXJlIG91dCB3aGV0aGVyIGNvaGVyZW50IGRtYS1yZW1hcHBpbmcgbWlnaHQgYmUK KyAqIHRha2luZyBwbGFjZS4KKyAqIEBkZXY6IFBvaW50ZXIgdG8gdGhlIHN0cnVjdCBkcm1fZGV2 aWNlLgorICoKKyAqIFJldHVybjogdHJ1ZSBpZiBpb21tdSBwcmVzZW50LCBmYWxzZSBvdGhlcndp c2UuCisgKi8KK3N0YXRpYyBib29sIHZtd19hc3N1bWVfaW9tbXUoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKK3sKKwljb25zdCBzdHJ1Y3QgZG1hX21hcF9vcHMgKm9wcyA9IGdldF9kbWFfb3BzKGRl di0+ZGV2KTsKKworCXJldHVybiAhZG1hX2lzX2RpcmVjdChvcHMpICYmIG9wcy0+bWFwX3BhZ2Ug IT0gZG1hX2RpcmVjdF9tYXBfcGFnZTsKK30KKwogLyoqCiAgKiB2bXdfZG1hX3NlbGVjdF9tb2Rl IC0gRGV0ZXJtaW5lIGhvdyBETUEgbWFwcGluZ3Mgc2hvdWxkIGJlIHNldCB1cCBmb3IgdGhpcwog ICogc3lzdGVtLgpAQCAtNTY4LDcgKzU4Miw3IEBAIHN0YXRpYyBpbnQgdm13X2RtYV9zZWxlY3Rf bW9kZShzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2KQogCiAJaWYgKHZtd19mb3JjZV9jb2hl cmVudCkKIAkJZGV2X3ByaXYtPm1hcF9tb2RlID0gdm13X2RtYV9hbGxvY19jb2hlcmVudDsKLQll bHNlIGlmIChpbnRlbF9pb21tdV9lbmFibGVkKQorCWVsc2UgaWYgKHZtd19hc3N1bWVfaW9tbXUo ZGV2X3ByaXYtPmRldikpCiAJCWRldl9wcml2LT5tYXBfbW9kZSA9IHZtd19kbWFfbWFwX3BvcHVs YXRlOwogCWVsc2UgaWYgKCF2bXdfZm9yY2VfaW9tbXUpCiAJCWRldl9wcml2LT5tYXBfbW9kZSA9 IHZtd19kbWFfcGh5czsKQEAgLTYwMSw3ICs2MTUsNyBAQCBzdGF0aWMgaW50IHZtd19kbWFfbWFz a3Moc3RydWN0IHZtd19wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gZGV2X3ByaXYtPmRldjsKIAotCWlmIChpbnRlbF9pb21tdV9lbmFibGVkICYmCisJaWYg KHZtd19hc3N1bWVfaW9tbXUoZGV2KSAmJgogCSAgICAoc2l6ZW9mKHVuc2lnbmVkIGxvbmcpID09 IDQgfHwgdm13X3Jlc3RyaWN0X2RtYV9tYXNrKSkgewogCQlEUk1fSU5GTygiUmVzdHJpY3Rpbmcg RE1BIGFkZHJlc3NlcyB0byA0NCBiaXRzLlxuIik7CiAJCXJldHVybiBkbWFfc2V0X21hc2soZGV2 LT5kZXYsIERNQV9CSVRfTUFTSyg0NCkpOwotLSAKMi4xOS4wLnJjMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==