From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 2/4] drm/vmwgfx: remove CONFIG_INTEL_IOMMU ifdefs Date: Sat, 5 Jan 2019 09:01:06 +0100 Message-ID: <20190105080108.14837-3-hch@lst.de> References: <20190105080108.14837-1-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by gabe.freedesktop.org (Postfix) with ESMTPS id E26816ED74 for ; Sat, 5 Jan 2019 08:01:18 +0000 (UTC) In-Reply-To: <20190105080108.14837-1-hch@lst.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: thellstrom@vmware.com Cc: iommu@lists.linux-foundation.org, linux-graphics-maintainer@vmware.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org aW50ZWxfaW9tbXVfZW5hYmxlZCBpcyBkZWZpbmVkIGFzIGFsd2F5cyBmYWxzZSBmb3IgIUNPTkZJ R19JTlRFTF9JT01NVSwKc28gcmVtb3ZlIHRoZSBpZmRlZnMgYXJvdW5kIGl0LgoKU2lnbmVkLW9m Zi1ieTogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+Ci0tLQogZHJpdmVycy9ncHUvZHJt L3Ztd2dmeC92bXdnZnhfZHJ2LmMgfCAxOCAtLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4 L3Ztd2dmeF9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jCmluZGV4 IDY5ZTMyNWIyZDk1NC4uMjM2MDUyYWQyMzNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v dm13Z2Z4L3Ztd2dmeF9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9k cnYuYwpAQCAtNTY3LDEyICs1NjcsMTAgQEAgc3RhdGljIGludCB2bXdfZG1hX3NlbGVjdF9tb2Rl KHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCVt2bXdfZG1hX21hcF9iaW5kXSA9ICJH aXZpbmcgdXAgRE1BIG1hcHBpbmdzIGVhcmx5LiJ9OwogCWNvbnN0IHN0cnVjdCBkbWFfbWFwX29w cyAqZG1hX29wcyA9IGdldF9kbWFfb3BzKGRldl9wcml2LT5kZXYtPmRldik7CiAKLSNpZmRlZiBD T05GSUdfSU5URUxfSU9NTVUKIAlpZiAoaW50ZWxfaW9tbXVfZW5hYmxlZCkgewogCQlkZXZfcHJp di0+bWFwX21vZGUgPSB2bXdfZG1hX21hcF9wb3B1bGF0ZTsKIAkJZ290byBvdXRfZml4dXA7CiAJ fQotI2VuZGlmCiAKIAlpZiAoISh2bXdfZm9yY2VfaW9tbXUgfHwgdm13X2ZvcmNlX2NvaGVyZW50 KSkgewogCQlkZXZfcHJpdi0+bWFwX21vZGUgPSB2bXdfZG1hX3BoeXM7CkBAIC01ODksOSArNTg3 LDcgQEAgc3RhdGljIGludCB2bXdfZG1hX3NlbGVjdF9tb2RlKHN0cnVjdCB2bXdfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJCWRldl9wcml2LT5tYXBfbW9kZSA9IHZtd19kbWFfbWFwX3BvcHVsYXRlOwog I2VuZGlmCiAKLSNpZmRlZiBDT05GSUdfSU5URUxfSU9NTVUKIG91dF9maXh1cDoKLSNlbmRpZgog CWlmIChkZXZfcHJpdi0+bWFwX21vZGUgPT0gdm13X2RtYV9tYXBfcG9wdWxhdGUgJiYKIAkgICAg dm13X3Jlc3RyaWN0X2lvbW11KQogCQlkZXZfcHJpdi0+bWFwX21vZGUgPSB2bXdfZG1hX21hcF9i aW5kOwpAQCAtNTk5LDEzICs1OTUsNiBAQCBzdGF0aWMgaW50IHZtd19kbWFfc2VsZWN0X21vZGUo c3RydWN0IHZtd19wcml2YXRlICpkZXZfcHJpdikKIAlpZiAodm13X2ZvcmNlX2NvaGVyZW50KQog CQlkZXZfcHJpdi0+bWFwX21vZGUgPSB2bXdfZG1hX2FsbG9jX2NvaGVyZW50OwogCi0jaWYgIWRl ZmluZWQoQ09ORklHX1NXSU9UTEIpICYmICFkZWZpbmVkKENPTkZJR19JTlRFTF9JT01NVSkKLQkv KgotCSAqIE5vIGNvaGVyZW50IHBhZ2UgcG9vbAotCSAqLwotCWlmIChkZXZfcHJpdi0+bWFwX21v ZGUgPT0gdm13X2RtYV9hbGxvY19jb2hlcmVudCkKLQkJcmV0dXJuIC1FSU5WQUw7Ci0jZW5kaWYK IAlEUk1fSU5GTygiRE1BIG1hcCBtb2RlOiAlc1xuIiwgbmFtZXNbZGV2X3ByaXYtPm1hcF9tb2Rl XSk7CiAKIAlyZXR1cm4gMDsKQEAgLTYxOSw3ICs2MDgsNiBAQCBzdGF0aWMgaW50IHZtd19kbWFf c2VsZWN0X21vZGUoc3RydWN0IHZtd19wcml2YXRlICpkZXZfcHJpdikKICAqIFdpdGggMzItYml0 IHdlIGNhbiBvbmx5IGhhbmRsZSAzMiBiaXQgUEZOcy4gT3B0aW9uYWxseSBzZXQgdGhhdAogICog cmVzdHJpY3Rpb24gYWxzbyBmb3IgNjQtYml0IHN5c3RlbXMuCiAgKi8KLSNpZmRlZiBDT05GSUdf SU5URUxfSU9NTVUKIHN0YXRpYyBpbnQgdm13X2RtYV9tYXNrcyhzdHJ1Y3Qgdm13X3ByaXZhdGUg KmRldl9wcml2KQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OwpA QCAtNjMxLDEyICs2MTksNiBAQCBzdGF0aWMgaW50IHZtd19kbWFfbWFza3Moc3RydWN0IHZtd19w cml2YXRlICpkZXZfcHJpdikKIAl9CiAJcmV0dXJuIDA7CiB9Ci0jZWxzZQotc3RhdGljIGludCB2 bXdfZG1hX21hc2tzKHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0JcmV0dXJuIDA7 Ci19Ci0jZW5kaWYKIAogc3RhdGljIGludCB2bXdfZHJpdmVyX2xvYWQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgdW5zaWduZWQgbG9uZyBjaGlwc2V0KQogewotLSAKMi4yMC4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK