From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 2/2] drm/i915: Reorganize .disable hooks for pre-DDI DP Date: Wed, 20 Sep 2017 20:00:21 +0300 Message-ID: <20170920170021.GD4914@intel.com> References: <20170918173128.476-1-ville.syrjala@linux.intel.com> <20170918173128.476-2-ville.syrjala@linux.intel.com> <20170918204550.n5b2oi66zhutmi5t@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 994A389E32 for ; Wed, 20 Sep 2017 17:00:24 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170918204550.n5b2oi66zhutmi5t@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBTZXAgMTgsIDIwMTcgYXQgMDE6NDU6NTBQTSAtMDcwMCwgUm9kcmlnbyBWaXZpIHdy b3RlOgo+IE9uIE1vbiwgU2VwIDE4LCAyMDE3IGF0IDA1OjMxOjI4UE0gKzAwMDAsIFZpbGxlIFN5 cmphbGEgd3JvdGU6Cj4gPiBGcm9tOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgo+ID4gCj4gPiBNb3N0IG9mIG91ciBEUCBlbmNvZGVyIGhvb2tzIGFyZSBz cGxpdCBpbnRvIHBlci1wbGF0Zm9ybSB2YXJpYW50cy4KPiA+IC5kaXNhYmxlKCkgYW4gZXhjZXB0 aW9uLCBhbmQgdGh1cyBpdCdzIGEgYml0IG1lc3N5LiBMZXQncyBzcGxpdCBpdAo+ID4gdXAgYXMg d2VsbC4gV2UnbGwgbGVhdmUgdGhlIGNvbW1vbiBwYXJ0cyBpbiBhIGhlbHBlciBjYWxsZWQgYnkK PiA+IGVhY2ggcGxhdGZvcm0gc3BlY2lmaWMgaG9vay4KPiA+IAo+ID4gVGhlcmUgaXMgYSBzdWJ0 bGUgY2hhbmdlIG9uIFZMVi9DSFYgd2hlcmUgd2Ugbm93IGRpc2FibGUgUFNSIGJlZm9yZQo+ID4g YXVkaW8sIHdoZXJlYXMgYmVmb3JlIHdlIGRpc2FibGVkIFBTUiBhZnRlciBhdWRpby4gVGhhdCBz aG91bGQgYmUKPiA+IHRvdGFsbHkgZmluZSwgYW5kIFBTUiBpcyBkaXNhYmxlZCBieSBkZWZhdWx0 IGFueXdheS4KPiA+IAo+ID4gU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5z eXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiA+IC0tLQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMgfCA0NCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0t LQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQo+ ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiA+IGluZGV4IGQwZWE5YzRmODdjOC4uZGNk ZWZkOTg2NTY5IDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu Ywo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwo+ID4gQEAgLTI2OTIs MjMgKzI2OTIsNDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9kcChzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2RlciwKPiA+ICAJCQkgICAgIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9y X3N0YXRlICpvbGRfY29ubl9zdGF0ZSkKPiA+ICB7Cj4gPiAgCXN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOwo+ID4gLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKPiA+ ICAKPiA+ICAJaWYgKG9sZF9jcnRjX3N0YXRlLT5oYXNfYXVkaW8pCj4gPiAgCQlpbnRlbF9hdWRp b19jb2RlY19kaXNhYmxlKGVuY29kZXIpOwo+ID4gIAo+ID4gLQlpbnRlbF9wc3JfZGlzYWJsZShp bnRlbF9kcCwgb2xkX2NydGNfc3RhdGUpOwo+ID4gLQo+ID4gIAkvKiBNYWtlIHN1cmUgdGhlIHBh bmVsIGlzIG9mZiBiZWZvcmUgdHJ5aW5nIHRvIGNoYW5nZSB0aGUgbW9kZS4gQnV0IGFsc28KPiA+ ICAJICogZW5zdXJlIHRoYXQgd2UgaGF2ZSB2ZGQgd2hpbGUgd2Ugc3dpdGNoIG9mZiB0aGUgcGFu ZWwuICovCj4gPiAgCWludGVsX2VkcF9wYW5lbF92ZGRfb24oaW50ZWxfZHApOwo+ID4gIAlpbnRl bF9lZHBfYmFja2xpZ2h0X29mZihvbGRfY29ubl9zdGF0ZSk7Cj4gPiAgCWludGVsX2RwX3Npbmtf ZHBtcyhpbnRlbF9kcCwgRFJNX01PREVfRFBNU19PRkYpOwo+ID4gIAlpbnRlbF9lZHBfcGFuZWxf b2ZmKGludGVsX2RwKTsKPiA+ICt9Cj4gPiArCj4gPiArc3RhdGljIHZvaWQgZzR4X2Rpc2FibGVf ZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCj4gPiArCQkJICAgY29uc3Qgc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAo+ID4gKwkJCSAgIGNvbnN0IHN0cnVj dCBkcm1fY29ubmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZSkKPiA+ICt7Cj4gPiArCXN0cnVj dCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOwo+ ID4gKwo+ID4gKwlpbnRlbF9kaXNhYmxlX2RwKGVuY29kZXIsIG9sZF9jcnRjX3N0YXRlLCBvbGRf Y29ubl9zdGF0ZSk7Cj4gPiAgCj4gPiAgCS8qIGRpc2FibGUgdGhlIHBvcnQgYmVmb3JlIHRoZSBw aXBlIG9uIGc0eCAqLwo+ID4gLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDUpCj4gPiAtCQlp bnRlbF9kcF9saW5rX2Rvd24oaW50ZWxfZHApOwo+ID4gKwlpbnRlbF9kcF9saW5rX2Rvd24oaW50 ZWxfZHApOwo+ID4gK30KPiA+ICsKPiA+ICtzdGF0aWMgdm9pZCBpbGtfZGlzYWJsZV9kcChzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKPiA+ICsJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCj4gPiArCQkJICAgY29uc3Qgc3RydWN0IGRybV9j b25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlKQo+ID4gK3sKPiA+ICsJaW50ZWxfZGlzYWJs ZV9kcChlbmNvZGVyLCBvbGRfY3J0Y19zdGF0ZSwgb2xkX2Nvbm5fc3RhdGUpOwo+ID4gK30KPiA+ ICsKPiA+ICtzdGF0aWMgdm9pZCB2bHZfZGlzYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciwKPiA+ICsJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2Ny dGNfc3RhdGUsCj4gPiArCQkJICAgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9s ZF9jb25uX3N0YXRlKQo+ID4gK3sKPiA+ICsJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGVu Y190b19pbnRlbF9kcCgmZW5jb2Rlci0+YmFzZSk7Cj4gPiArCj4gPiArCWludGVsX3Bzcl9kaXNh YmxlKGludGVsX2RwLCBvbGRfY3J0Y19zdGF0ZSk7Cj4gCj4gb2ghIG5vdCBpdCBtYWtlcyBzZW5z ZS4uLgo+IHBsZWFzZSBtb3ZlIHRoZSB0aGF0IHJlbW92YWwgb2YgIUhBU19EREkgZnJvbSB0aGUg Zmlyc3QgcGF0Y2ggdG8gdGhpcyBwYXRjaAo+IGFuZCBmZWVsIGZyZWUgdG8gYWQgbXkgcnYtYiBv biBib3RoIHBhdGNoZXMuCgpVcGRhdGVkIHBhdGNoZXMgcHVzaGVkIHB1c2hlZCB0byBkaW5xLiBU aGFua3MgZm9yIHRoZSByZXZpZXcuCgo+IAo+ID4gKwo+ID4gKwlpbnRlbF9kaXNhYmxlX2RwKGVu Y29kZXIsIG9sZF9jcnRjX3N0YXRlLCBvbGRfY29ubl9zdGF0ZSk7Cj4gPiAgfQo+ID4gIAo+ID4g IHN0YXRpYyB2b2lkIGlsa19wb3N0X2Rpc2FibGVfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVu Y29kZXIsCj4gPiBAQCAtNjE0NCw3ICs2MTY3LDYgQEAgYm9vbCBpbnRlbF9kcF9pbml0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiA+ICAJCWdvdG8gZXJyX2VuY29kZXJfaW5p dDsKPiA+ICAKPiA+ICAJaW50ZWxfZW5jb2Rlci0+Y29tcHV0ZV9jb25maWcgPSBpbnRlbF9kcF9j b21wdXRlX2NvbmZpZzsKPiA+IC0JaW50ZWxfZW5jb2Rlci0+ZGlzYWJsZSA9IGludGVsX2Rpc2Fi bGVfZHA7Cj4gPiAgCWludGVsX2VuY29kZXItPmdldF9od19zdGF0ZSA9IGludGVsX2RwX2dldF9o d19zdGF0ZTsKPiA+ICAJaW50ZWxfZW5jb2Rlci0+Z2V0X2NvbmZpZyA9IGludGVsX2RwX2dldF9j b25maWc7Cj4gPiAgCWludGVsX2VuY29kZXItPnN1c3BlbmQgPSBpbnRlbF9kcF9lbmNvZGVyX3N1 c3BlbmQ7Cj4gPiBAQCAtNjE1MiwxOCArNjE3NCwyNCBAQCBib29sIGludGVsX2RwX2luaXQoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ID4gIAkJaW50ZWxfZW5jb2Rlci0+cHJl X3BsbF9lbmFibGUgPSBjaHZfZHBfcHJlX3BsbF9lbmFibGU7Cj4gPiAgCQlpbnRlbF9lbmNvZGVy LT5wcmVfZW5hYmxlID0gY2h2X3ByZV9lbmFibGVfZHA7Cj4gPiAgCQlpbnRlbF9lbmNvZGVyLT5l bmFibGUgPSB2bHZfZW5hYmxlX2RwOwo+ID4gKwkJaW50ZWxfZW5jb2Rlci0+ZGlzYWJsZSA9IHZs dl9kaXNhYmxlX2RwOwo+ID4gIAkJaW50ZWxfZW5jb2Rlci0+cG9zdF9kaXNhYmxlID0gY2h2X3Bv c3RfZGlzYWJsZV9kcDsKPiA+ICAJCWludGVsX2VuY29kZXItPnBvc3RfcGxsX2Rpc2FibGUgPSBj aHZfZHBfcG9zdF9wbGxfZGlzYWJsZTsKPiA+ICAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2KSkgewo+ID4gIAkJaW50ZWxfZW5jb2Rlci0+cHJlX3BsbF9lbmFibGUgPSB2bHZfZHBf cHJlX3BsbF9lbmFibGU7Cj4gPiAgCQlpbnRlbF9lbmNvZGVyLT5wcmVfZW5hYmxlID0gdmx2X3By ZV9lbmFibGVfZHA7Cj4gPiAgCQlpbnRlbF9lbmNvZGVyLT5lbmFibGUgPSB2bHZfZW5hYmxlX2Rw Owo+ID4gKwkJaW50ZWxfZW5jb2Rlci0+ZGlzYWJsZSA9IHZsdl9kaXNhYmxlX2RwOwo+ID4gIAkJ aW50ZWxfZW5jb2Rlci0+cG9zdF9kaXNhYmxlID0gdmx2X3Bvc3RfZGlzYWJsZV9kcDsKPiA+ICsJ fSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUpIHsKPiA+ICsJCWludGVsX2VuY29k ZXItPnByZV9lbmFibGUgPSBnNHhfcHJlX2VuYWJsZV9kcDsKPiA+ICsJCWludGVsX2VuY29kZXIt PmVuYWJsZSA9IGc0eF9lbmFibGVfZHA7Cj4gPiArCQlpbnRlbF9lbmNvZGVyLT5kaXNhYmxlID0g aWxrX2Rpc2FibGVfZHA7Cj4gPiArCQlpbnRlbF9lbmNvZGVyLT5wb3N0X2Rpc2FibGUgPSBpbGtf cG9zdF9kaXNhYmxlX2RwOwo+ID4gIAl9IGVsc2Ugewo+ID4gIAkJaW50ZWxfZW5jb2Rlci0+cHJl X2VuYWJsZSA9IGc0eF9wcmVfZW5hYmxlX2RwOwo+ID4gIAkJaW50ZWxfZW5jb2Rlci0+ZW5hYmxl ID0gZzR4X2VuYWJsZV9kcDsKPiA+IC0JCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUpCj4g PiAtCQkJaW50ZWxfZW5jb2Rlci0+cG9zdF9kaXNhYmxlID0gaWxrX3Bvc3RfZGlzYWJsZV9kcDsK PiA+ICsJCWludGVsX2VuY29kZXItPmRpc2FibGUgPSBnNHhfZGlzYWJsZV9kcDsKPiA+ICAJfQo+ ID4gIAo+ID4gIAlpbnRlbF9kaWdfcG9ydC0+cG9ydCA9IHBvcnQ7Cj4gPiAtLSAKPiA+IDIuMTMu NQo+ID4gCj4gPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Xwo+ID4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+ID4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwo+ID4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngKCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=