From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Hellstrom <thellstrom@vmware.com>
Subject: [PATCH 2/4] drm/vmwgfx: remove CONFIG_INTEL_IOMMU ifdefs v2
Date: Fri, 25 Jan 2019 09:12:13 +0100
Message-ID: <20190125081215.4622-3-thellstrom@vmware.com>
References: <20190125081215.4622-1-thellstrom@vmware.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
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 8440C6F287
 for <dri-devel@lists.freedesktop.org>; Fri, 25 Jan 2019 08:12:32 +0000 (UTC)
In-Reply-To: <20190125081215.4622-1-thellstrom@vmware.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: hch@lst.de, dri-devel@lists.freedesktop.org, linux-graphics-maintainer@vmware.com
List-Id: dri-devel@lists.freedesktop.org

RnJvbTogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+CgppbnRlbF9pb21tdV9lbmFibGVk
IGlzIGRlZmluZWQgYXMgYWx3YXlzIGZhbHNlIGZvciAhQ09ORklHX0lOVEVMX0lPTU1VLApzbyBy
ZW1vdmUgdGhlIGlmZGVmcyBhcm91bmQgaXQuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RvcGggSGVs
bHdpZyA8aGNoQGxzdC5kZT4KUmV2aWV3ZWQtYnk6IFRob21hcyBIZWxsc3Ryb20gPHRoZWxsc3Ry
b21Adm13YXJlLmNvbT4KLS0tCnYyOiBSZXRhaW4gdGhlIGNoZWNrIGZvciBUVE0gZG1hIHBhZ2Ug
cG9vbCBwcmVzZW5jZS4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYyB8
IDIxICsrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygr
KSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92
bXdnZnhfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYwppbmRleCA2
OWUzMjViMmQ5NTQuLmI3Nzc3YjViNGE4MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Zt
d2dmeC92bXdnZnhfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZHJ2
LmMKQEAgLTU2NywxMiArNTY3LDEwIEBAIHN0YXRpYyBpbnQgdm13X2RtYV9zZWxlY3RfbW9kZShz
dHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2KQogCQlbdm13X2RtYV9tYXBfYmluZF0gPSAiR2l2
aW5nIHVwIERNQSBtYXBwaW5ncyBlYXJseS4ifTsKIAljb25zdCBzdHJ1Y3QgZG1hX21hcF9vcHMg
KmRtYV9vcHMgPSBnZXRfZG1hX29wcyhkZXZfcHJpdi0+ZGV2LT5kZXYpOwogCi0jaWZkZWYgQ09O
RklHX0lOVEVMX0lPTU1VCiAJaWYgKGludGVsX2lvbW11X2VuYWJsZWQpIHsKIAkJZGV2X3ByaXYt
Pm1hcF9tb2RlID0gdm13X2RtYV9tYXBfcG9wdWxhdGU7CiAJCWdvdG8gb3V0X2ZpeHVwOwogCX0K
LSNlbmRpZgogCiAJaWYgKCEodm13X2ZvcmNlX2lvbW11IHx8IHZtd19mb3JjZV9jb2hlcmVudCkp
IHsKIAkJZGV2X3ByaXYtPm1hcF9tb2RlID0gdm13X2RtYV9waHlzOwpAQCAtNTg5LDkgKzU4Nyw3
IEBAIHN0YXRpYyBpbnQgdm13X2RtYV9zZWxlY3RfbW9kZShzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRl
dl9wcml2KQogCQlkZXZfcHJpdi0+bWFwX21vZGUgPSB2bXdfZG1hX21hcF9wb3B1bGF0ZTsKICNl
bmRpZgogCi0jaWZkZWYgQ09ORklHX0lOVEVMX0lPTU1VCiBvdXRfZml4dXA6Ci0jZW5kaWYKIAlp
ZiAoZGV2X3ByaXYtPm1hcF9tb2RlID09IHZtd19kbWFfbWFwX3BvcHVsYXRlICYmCiAJICAgIHZt
d19yZXN0cmljdF9pb21tdSkKIAkJZGV2X3ByaXYtPm1hcF9tb2RlID0gdm13X2RtYV9tYXBfYmlu
ZDsKQEAgLTU5OSwxMyArNTk1LDExIEBAIHN0YXRpYyBpbnQgdm13X2RtYV9zZWxlY3RfbW9kZShz
dHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2KQogCWlmICh2bXdfZm9yY2VfY29oZXJlbnQpCiAJ
CWRldl9wcml2LT5tYXBfbW9kZSA9IHZtd19kbWFfYWxsb2NfY29oZXJlbnQ7CiAKLSNpZiAhZGVm
aW5lZChDT05GSUdfU1dJT1RMQikgJiYgIWRlZmluZWQoQ09ORklHX0lOVEVMX0lPTU1VKQotCS8q
Ci0JICogTm8gY29oZXJlbnQgcGFnZSBwb29sCi0JICovCi0JaWYgKGRldl9wcml2LT5tYXBfbW9k
ZSA9PSB2bXdfZG1hX2FsbG9jX2NvaGVyZW50KQorCS8qIE5vIFRUTSBjb2hlcmVudCBwYWdlIHBv
b2w/IEZJWE1FOiBBc2sgVFRNIGluc3RlYWQhICovCisJaWYgKCEoSVNfRU5BQkxFRChDT05GSUdf
U1dJT1RMQikgfHwgSVNfRU5BQkxFRChDT05GSUdfSU5URUxfSU9NTVUpKSAmJgorCSAgICAoZGV2
X3ByaXYtPm1hcF9tb2RlID09IHZtd19kbWFfYWxsb2NfY29oZXJlbnQpKQogCQlyZXR1cm4gLUVJ
TlZBTDsKLSNlbmRpZgorCiAJRFJNX0lORk8oIkRNQSBtYXAgbW9kZTogJXNcbiIsIG5hbWVzW2Rl
dl9wcml2LT5tYXBfbW9kZV0pOwogCiAJcmV0dXJuIDA7CkBAIC02MTksNyArNjEzLDYgQEAgc3Rh
dGljIGludCB2bXdfZG1hX3NlbGVjdF9tb2RlKHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYp
CiAgKiBXaXRoIDMyLWJpdCB3ZSBjYW4gb25seSBoYW5kbGUgMzIgYml0IFBGTnMuIE9wdGlvbmFs
bHkgc2V0IHRoYXQKICAqIHJlc3RyaWN0aW9uIGFsc28gZm9yIDY0LWJpdCBzeXN0ZW1zLgogICov
Ci0jaWZkZWYgQ09ORklHX0lOVEVMX0lPTU1VCiBzdGF0aWMgaW50IHZtd19kbWFfbWFza3Moc3Ry
dWN0IHZtd19wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g
ZGV2X3ByaXYtPmRldjsKQEAgLTYzMSwxMiArNjI0LDYgQEAgc3RhdGljIGludCB2bXdfZG1hX21h
c2tzKHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfQogCXJldHVybiAwOwogfQotI2Vs
c2UKLXN0YXRpYyBpbnQgdm13X2RtYV9tYXNrcyhzdHJ1Y3Qgdm13X3ByaXZhdGUgKmRldl9wcml2
KQotewotCXJldHVybiAwOwotfQotI2VuZGlmCiAKIHN0YXRpYyBpbnQgdm13X2RyaXZlcl9sb2Fk
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgY2hpcHNldCkKIHsKLS0gCjIu
MTkuMC5yYzEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo
dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=