From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH] drm/i915: Consolidate #ifdef CONFIG_INTEL_IOMMU Date: Thu, 25 May 2017 14:58:32 +0100 Message-ID: <09bfc0c6-4924-e2e7-2400-89ca1ea968a1@linux.intel.com> References: <20170525121612.2190-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0759D6E9C8 for ; Thu, 25 May 2017 13:58:36 +0000 (UTC) In-Reply-To: <20170525121612.2190-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Ck9uIDI1LzA1LzIwMTcgMTM6MTYsIENocmlzIFdpbHNvbiB3cm90ZToKPiBXZSBkZXBlbmQgb24g aW50ZWxfaW9tbXVfZ2Z4X21hcHBlZCBmb3IgdmFyaW91cyB3b3JrYXJvdW5kcywgYnV0IHRoYXQg aXMKPiBvbmx5IGF2YWlsYWJsZSB1bmRlciBhbiAjaWZkZWYgQ09ORklHX0lOVEVMX0lPTU1VLiBS ZWZhY3RvciBhbGwgdGhlCj4gY3V0LWFuZC1wYXN0ZSBpZmRlZnMgdG8gYSBjb21tb24gcm91dGlu ZS4KPgo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICB8IDE1 ICsrKysrKysrLS0tLS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAg ICB8ICA0ICstLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgfCAx NCArKystLS0tLS0tLS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4u YyB8ICA0ICstLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMgICAgICAgfCAg NCArLS0tCj4gIDUgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25z KC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCBhNWEwMWI2ODNkNDguLjliYTIy NDI3YzA1YyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+IEBAIC0yOTk3LDIzICsyOTk3 LDI0IEBAIGludGVsX2luZm8oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQo+Cj4gICNpbmNsdWRlICJpOTE1X3RyYWNlLmgiCj4KPiAtc3RhdGljIGlubGluZSBib29sIGlu dGVsX3NjYW5vdXRfbmVlZHNfdnRkX3dhKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKPiArc3RhdGljIGlubGluZSBib29sIGludGVsX3Z0ZF9hY3RpdmUodm9pZCkKPiAgewo+ICAj aWZkZWYgQ09ORklHX0lOVEVMX0lPTU1VCj4gLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2 ICYmIGludGVsX2lvbW11X2dmeF9tYXBwZWQpCj4gKwlpZiAoaW50ZWxfaW9tbXVfZ2Z4X21hcHBl ZCkKPiAgCQlyZXR1cm4gdHJ1ZTsKPiAgI2VuZGlmCj4gIAlyZXR1cm4gZmFsc2U7Cj4gIH0KPgo+ ICtzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWxfc2Nhbm91dF9uZWVkc192dGRfd2Eoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ICt7Cj4gKwlyZXR1cm4gSU5URUxfR0VOKGRldl9w cml2KSA+PSA2ICYmIGludGVsX3Z0ZF9hY3RpdmUoKTsKPiArfQo+ICsKPiAgc3RhdGljIGlubGlu ZSBib29sCj4gIGludGVsX2dndHRfdXBkYXRlX25lZWRzX3Z0ZF93YShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCj4gIHsKPiAtI2lmZGVmIENPTkZJR19JTlRFTF9JT01NVQo+IC0J aWYgKElTX0JST1hUT04oZGV2X3ByaXYpICYmIGludGVsX2lvbW11X2dmeF9tYXBwZWQpCj4gLQkJ cmV0dXJuIHRydWU7Cj4gLSNlbmRpZgo+IC0JcmV0dXJuIGZhbHNlOwo+ICsJcmV0dXJuIElTX0JS T1hUT04oZGV2X3ByaXYpICYmIGludGVsX3Z0ZF9hY3RpdmUoKTsKPiAgfQo+Cj4gIGludCBpbnRl bF9zYW5pdGl6ZV9lbmFibGVfcHBndHQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IGluZGV4IGE2MzdjYzA1Y2M0YS4uN2FiNDdhODQ2 NzFmIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gQEAgLTQ3MjgsMTEgKzQ3MjgsOSBA QCBib29sIGludGVsX3Nhbml0aXplX3NlbWFwaG9yZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LCBpbnQgdmFsdWUpCj4gIAlpZiAodmFsdWUgPj0gMCkKPiAgCQlyZXR1cm4gdmFs dWU7Cj4KPiAtI2lmZGVmIENPTkZJR19JTlRFTF9JT01NVQo+ICAJLyogRW5hYmxlIHNlbWFwaG9y ZXMgb24gU05CIHdoZW4gSU8gcmVtYXBwaW5nIGlzIG9mZiAqLwo+IC0JaWYgKElOVEVMX0lORk8o ZGV2X3ByaXYpLT5nZW4gPT0gNiAmJiBpbnRlbF9pb21tdV9nZnhfbWFwcGVkKQo+ICsJaWYgKElT X0dFTjYoZGV2X3ByaXYpICYmIGludGVsX3Z0ZF9hY3RpdmUoKSkKPiAgCQlyZXR1cm4gZmFsc2U7 Cj4gLSNlbmRpZgo+Cj4gIAlyZXR1cm4gdHJ1ZTsKPiAgfQo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jCj4gaW5kZXggMTMyOTJlYjRlODI3Li4wYzEwMDhhMmJiZGEgMTAwNjQ0Cj4gLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKPiArKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwo+IEBAIC0xNjgsMTMgKzE2OCwxMSBAQCBpbnQgaW50 ZWxfc2FuaXRpemVfZW5hYmxlX3BwZ3R0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKPiAgCWlmIChlbmFibGVfcHBndHQgPT0gMyAmJiBoYXNfZnVsbF80OGJpdF9wcGd0dCkKPiAg CQlyZXR1cm4gMzsKPgo+IC0jaWZkZWYgQ09ORklHX0lOVEVMX0lPTU1VCj4gIAkvKiBEaXNhYmxl IHBwZ3R0IG9uIFNOQiBpZiBWVC1kIGlzIG9uLiAqLwo+IC0JaWYgKElTX0dFTjYoZGV2X3ByaXYp ICYmIGludGVsX2lvbW11X2dmeF9tYXBwZWQpIHsKPiArCWlmIChJU19HRU42KGRldl9wcml2KSAm JiBpbnRlbF92dGRfYWN0aXZlKCkpIHsKPiAgCQlEUk1fSU5GTygiRGlzYWJsaW5nIFBQR1RUIGJl Y2F1c2UgVlQtZCBpcyBvblxuIik7Cj4gIAkJcmV0dXJuIDA7Cj4gIAl9Cj4gLSNlbmRpZgo+Cj4g IAkvKiBFYXJseSBWTFYgZG9lc24ndCBoYXZlIHRoaXMgKi8KPiAgCWlmIChJU19WQUxMRVlWSUVX KGRldl9wcml2KSAmJiBkZXZfcHJpdi0+ZHJtLnBkZXYtPnJldmlzaW9uIDwgMHhiKSB7Cj4gQEAg LTE5OTIsMTQgKzE5OTAsMTAgQEAgdm9pZCBpOTE1X3BwZ3R0X3JlbGVhc2Uoc3RydWN0IGtyZWYg KmtyZWYpCj4gICAqLwo+ICBzdGF0aWMgYm9vbCBuZWVkc19pZGxlX21hcHMoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ICB7Cj4gLSNpZmRlZiBDT05GSUdfSU5URUxfSU9NTVUK PiAgCS8qIFF1ZXJ5IGludGVsX2lvbW11IHRvIHNlZSBpZiB3ZSBuZWVkIHRoZSB3b3JrYXJvdW5k LiBQcmVzdW1hYmx5IHRoYXQKPiAgCSAqIHdhcyBsb2FkZWQgZmlyc3QuCj4gIAkgKi8KPiAtCWlm IChJU19HRU41KGRldl9wcml2KSAmJiBJU19NT0JJTEUoZGV2X3ByaXYpICYmIGludGVsX2lvbW11 X2dmeF9tYXBwZWQpCj4gLQkJcmV0dXJuIHRydWU7Cj4gLSNlbmRpZgo+IC0JcmV0dXJuIGZhbHNl Owo+ICsJcmV0dXJuIElTX0dFTjUoZGV2X3ByaXYpICYmIElTX01PQklMRShkZXZfcHJpdikgJiYg aW50ZWxfdnRkX2FjdGl2ZSgpOwo+ICB9Cj4KPiAgdm9pZCBpOTE1X2NoZWNrX2FuZF9jbGVhcl9m YXVsdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+IEBAIC0zMDM5LDEwICsz MDMzLDggQEAgaW50IGk5MTVfZ2d0dF9wcm9iZV9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCj4gIAkJIGdndHQtPmJhc2UudG90YWwgPj4gMjApOwo+ICAJRFJNX0RFQlVHX0RS SVZFUigiR01BRFIgc2l6ZSA9ICVsbGRNXG4iLCBnZ3R0LT5tYXBwYWJsZV9lbmQgPj4gMjApOwo+ ICAJRFJNX0RFQlVHX0RSSVZFUigiR1RUIHN0b2xlbiBzaXplID0gJXVNXG4iLCBnZ3R0LT5zdG9s ZW5fc2l6ZSA+PiAyMCk7Cj4gLSNpZmRlZiBDT05GSUdfSU5URUxfSU9NTVUKPiAtCWlmIChpbnRl bF9pb21tdV9nZnhfbWFwcGVkKQo+ICsJaWYgKGludGVsX3Z0ZF9hY3RpdmUoKSkKPiAgCQlEUk1f SU5GTygiVlQtZCBhY3RpdmUgZm9yIGdmeCBhY2Nlc3NcbiIpOwo+IC0jZW5kaWYKPgo+ICAJcmV0 dXJuIDA7Cj4gIH0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f c3RvbGVuLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYwo+IGluZGV4 IGYzYWJkYzI3YzVkZC4uNjgxZGI2MDgzZjRkIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fc3RvbGVuLmMKPiBAQCAtNDE0LDEyICs0MTQsMTAgQEAgaW50IGk5MTVfZ2VtX2luaXRf c3RvbGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiAgCQlyZXR1cm4gMDsK PiAgCX0KPgo+IC0jaWZkZWYgQ09ORklHX0lOVEVMX0lPTU1VCj4gLQlpZiAoaW50ZWxfaW9tbXVf Z2Z4X21hcHBlZCAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOCkgewo+ICsJaWYgKGludGVsX3Z0 ZF9hY3RpdmUoKSAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOCkgewo+ICAJCURSTV9JTkZPKCJE TUFSIGFjdGl2ZSwgZGlzYWJsaW5nIHVzZSBvZiBzdG9sZW4gbWVtb3J5XG4iKTsKPiAgCQlyZXR1 cm4gMDsKPiAgCX0KPiAtI2VuZGlmCj4KPiAgCWlmIChnZ3R0LT5zdG9sZW5fc2l6ZSA9PSAwKQo+ ICAJCXJldHVybiAwOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9m YmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCj4gaW5kZXggZGI3ZjhmMGEx ZjM2Li5mZjJmYzViYzRhZjQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZmJjLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYwo+IEBAIC0x MzEyLDE0ICsxMzEyLDEyIEBAIHN0YXRpYyBpbnQgaW50ZWxfc2FuaXRpemVfZmJjX29wdGlvbihz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4KPiAgc3RhdGljIGJvb2wgbmVlZF9m YmNfdnRkX3dhKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiAgewo+IC0jaWZk ZWYgQ09ORklHX0lOVEVMX0lPTU1VCj4gIAkvKiBXYUZiY1R1cm5PZmZGYmNXaGVuSHlwZXJWaXNv cklzVXNlZDpza2wsYnh0ICovCj4gLQlpZiAoaW50ZWxfaW9tbXVfZ2Z4X21hcHBlZCAmJgo+ICsJ aWYgKGludGVsX3Z0ZF9hY3RpdmUoKSAmJgo+ICAJICAgIChJU19TS1lMQUtFKGRldl9wcml2KSB8 fCBJU19CUk9YVE9OKGRldl9wcml2KSkpIHsKPiAgCQlEUk1fSU5GTygiRGlzYWJsaW5nIGZyYW1l YnVmZmVyIGNvbXByZXNzaW9uIChGQkMpIHRvIHByZXZlbnQgc2NyZWVuIGZsaWNrZXIgd2l0aCBW VC1kIGVuYWJsZWRcbiIpOwo+ICAJCXJldHVybiB0cnVlOwo+ICAJfQo+IC0jZW5kaWYKPgo+ICAJ cmV0dXJuIGZhbHNlOwo+ICB9Cj4KClJldmlld2VkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtv LnVyc3VsaW5AaW50ZWwuY29tPgoKUmVnYXJkcywKClR2cnRrbwpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK