From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: Re: [PATCH 2/2] drm/i915: Reorganize .disable hooks for pre-DDI DP Date: Mon, 18 Sep 2017 13:45:50 -0700 Message-ID: <20170918204550.n5b2oi66zhutmi5t@intel.com> References: <20170918173128.476-1-ville.syrjala@linux.intel.com> <20170918173128.476-2-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id B40236E43E for ; Mon, 18 Sep 2017 20:45:50 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170918173128.476-2-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ville Syrjala Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBTZXAgMTgsIDIwMTcgYXQgMDU6MzE6MjhQTSArMDAwMCwgVmlsbGUgU3lyamFsYSB3 cm90ZToKPiBGcm9tOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgo+IAo+IE1vc3Qgb2Ygb3VyIERQIGVuY29kZXIgaG9va3MgYXJlIHNwbGl0IGludG8gcGVy LXBsYXRmb3JtIHZhcmlhbnRzLgo+IC5kaXNhYmxlKCkgYW4gZXhjZXB0aW9uLCBhbmQgdGh1cyBp dCdzIGEgYml0IG1lc3N5LiBMZXQncyBzcGxpdCBpdAo+IHVwIGFzIHdlbGwuIFdlJ2xsIGxlYXZl IHRoZSBjb21tb24gcGFydHMgaW4gYSBoZWxwZXIgY2FsbGVkIGJ5Cj4gZWFjaCBwbGF0Zm9ybSBz cGVjaWZpYyBob29rLgo+IAo+IFRoZXJlIGlzIGEgc3VidGxlIGNoYW5nZSBvbiBWTFYvQ0hWIHdo ZXJlIHdlIG5vdyBkaXNhYmxlIFBTUiBiZWZvcmUKPiBhdWRpbywgd2hlcmVhcyBiZWZvcmUgd2Ug ZGlzYWJsZWQgUFNSIGFmdGVyIGF1ZGlvLiBUaGF0IHNob3VsZCBiZQo+IHRvdGFsbHkgZmluZSwg YW5kIFBTUiBpcyBkaXNhYmxlZCBieSBkZWZhdWx0IGFueXdheS4KPiAKPiBTaWduZWQtb2ZmLWJ5 OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgo+IC0tLQo+ ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgNDQgKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDM2IGluc2VydGlvbnMo KyksIDggZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCj4gaW5kZXggZDBl YTljNGY4N2M4Li5kY2RlZmQ5ODY1NjkgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiBA QCAtMjY5MiwyMyArMjY5Miw0NiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX2RwKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAo+ICAJCQkgICAgIGNvbnN0IHN0cnVjdCBkcm1fY29u bmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZSkKPiAgewo+ICAJc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCA9IGVuY190b19pbnRlbF9kcCgmZW5jb2Rlci0+YmFzZSk7Cj4gLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKPiAg Cj4gIAlpZiAob2xkX2NydGNfc3RhdGUtPmhhc19hdWRpbykKPiAgCQlpbnRlbF9hdWRpb19jb2Rl Y19kaXNhYmxlKGVuY29kZXIpOwo+ICAKPiAtCWludGVsX3Bzcl9kaXNhYmxlKGludGVsX2RwLCBv bGRfY3J0Y19zdGF0ZSk7Cj4gLQo+ICAJLyogTWFrZSBzdXJlIHRoZSBwYW5lbCBpcyBvZmYgYmVm b3JlIHRyeWluZyB0byBjaGFuZ2UgdGhlIG1vZGUuIEJ1dCBhbHNvCj4gIAkgKiBlbnN1cmUgdGhh dCB3ZSBoYXZlIHZkZCB3aGlsZSB3ZSBzd2l0Y2ggb2ZmIHRoZSBwYW5lbC4gKi8KPiAgCWludGVs X2VkcF9wYW5lbF92ZGRfb24oaW50ZWxfZHApOwo+ICAJaW50ZWxfZWRwX2JhY2tsaWdodF9vZmYo b2xkX2Nvbm5fc3RhdGUpOwo+ICAJaW50ZWxfZHBfc2lua19kcG1zKGludGVsX2RwLCBEUk1fTU9E RV9EUE1TX09GRik7Cj4gIAlpbnRlbF9lZHBfcGFuZWxfb2ZmKGludGVsX2RwKTsKPiArfQo+ICsK PiArc3RhdGljIHZvaWQgZzR4X2Rpc2FibGVfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIsCj4gKwkJCSAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0 ZSwKPiArCQkJICAgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0 YXRlKQo+ICt7Cj4gKwlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2Rw KCZlbmNvZGVyLT5iYXNlKTsKPiArCj4gKwlpbnRlbF9kaXNhYmxlX2RwKGVuY29kZXIsIG9sZF9j cnRjX3N0YXRlLCBvbGRfY29ubl9zdGF0ZSk7Cj4gIAo+ICAJLyogZGlzYWJsZSB0aGUgcG9ydCBi ZWZvcmUgdGhlIHBpcGUgb24gZzR4ICovCj4gLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDUp Cj4gLQkJaW50ZWxfZHBfbGlua19kb3duKGludGVsX2RwKTsKPiArCWludGVsX2RwX2xpbmtfZG93 bihpbnRlbF9kcCk7Cj4gK30KPiArCj4gK3N0YXRpYyB2b2lkIGlsa19kaXNhYmxlX2RwKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAo+ICsJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCj4gKwkJCSAgIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVj dG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZSkKPiArewo+ICsJaW50ZWxfZGlzYWJsZV9kcChlbmNv ZGVyLCBvbGRfY3J0Y19zdGF0ZSwgb2xkX2Nvbm5fc3RhdGUpOwo+ICt9Cj4gKwo+ICtzdGF0aWMg dm9pZCB2bHZfZGlzYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKPiArCQkJ ICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAo+ICsJCQkg ICBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGUpCj4gK3sK PiArCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAoJmVuY29kZXIt PmJhc2UpOwo+ICsKPiArCWludGVsX3Bzcl9kaXNhYmxlKGludGVsX2RwLCBvbGRfY3J0Y19zdGF0 ZSk7CgpvaCEgbm90IGl0IG1ha2VzIHNlbnNlLi4uCnBsZWFzZSBtb3ZlIHRoZSB0aGF0IHJlbW92 YWwgb2YgIUhBU19EREkgZnJvbSB0aGUgZmlyc3QgcGF0Y2ggdG8gdGhpcyBwYXRjaAphbmQgZmVl bCBmcmVlIHRvIGFkIG15IHJ2LWIgb24gYm90aCBwYXRjaGVzLgoKPiArCj4gKwlpbnRlbF9kaXNh YmxlX2RwKGVuY29kZXIsIG9sZF9jcnRjX3N0YXRlLCBvbGRfY29ubl9zdGF0ZSk7Cj4gIH0KPiAg Cj4gIHN0YXRpYyB2b2lkIGlsa19wb3N0X2Rpc2FibGVfZHAoc3RydWN0IGludGVsX2VuY29kZXIg KmVuY29kZXIsCj4gQEAgLTYxNDQsNyArNjE2Nyw2IEBAIGJvb2wgaW50ZWxfZHBfaW5pdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gIAkJZ290byBlcnJfZW5jb2Rlcl9pbml0 Owo+ICAKPiAgCWludGVsX2VuY29kZXItPmNvbXB1dGVfY29uZmlnID0gaW50ZWxfZHBfY29tcHV0 ZV9jb25maWc7Cj4gLQlpbnRlbF9lbmNvZGVyLT5kaXNhYmxlID0gaW50ZWxfZGlzYWJsZV9kcDsK PiAgCWludGVsX2VuY29kZXItPmdldF9od19zdGF0ZSA9IGludGVsX2RwX2dldF9od19zdGF0ZTsK PiAgCWludGVsX2VuY29kZXItPmdldF9jb25maWcgPSBpbnRlbF9kcF9nZXRfY29uZmlnOwo+ICAJ aW50ZWxfZW5jb2Rlci0+c3VzcGVuZCA9IGludGVsX2RwX2VuY29kZXJfc3VzcGVuZDsKPiBAQCAt NjE1MiwxOCArNjE3NCwyNCBAQCBib29sIGludGVsX2RwX2luaXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAo+ICAJCWludGVsX2VuY29kZXItPnByZV9wbGxfZW5hYmxlID0gY2h2 X2RwX3ByZV9wbGxfZW5hYmxlOwo+ICAJCWludGVsX2VuY29kZXItPnByZV9lbmFibGUgPSBjaHZf cHJlX2VuYWJsZV9kcDsKPiAgCQlpbnRlbF9lbmNvZGVyLT5lbmFibGUgPSB2bHZfZW5hYmxlX2Rw Owo+ICsJCWludGVsX2VuY29kZXItPmRpc2FibGUgPSB2bHZfZGlzYWJsZV9kcDsKPiAgCQlpbnRl bF9lbmNvZGVyLT5wb3N0X2Rpc2FibGUgPSBjaHZfcG9zdF9kaXNhYmxlX2RwOwo+ICAJCWludGVs X2VuY29kZXItPnBvc3RfcGxsX2Rpc2FibGUgPSBjaHZfZHBfcG9zdF9wbGxfZGlzYWJsZTsKPiAg CX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpIHsKPiAgCQlpbnRlbF9lbmNvZGVy LT5wcmVfcGxsX2VuYWJsZSA9IHZsdl9kcF9wcmVfcGxsX2VuYWJsZTsKPiAgCQlpbnRlbF9lbmNv ZGVyLT5wcmVfZW5hYmxlID0gdmx2X3ByZV9lbmFibGVfZHA7Cj4gIAkJaW50ZWxfZW5jb2Rlci0+ ZW5hYmxlID0gdmx2X2VuYWJsZV9kcDsKPiArCQlpbnRlbF9lbmNvZGVyLT5kaXNhYmxlID0gdmx2 X2Rpc2FibGVfZHA7Cj4gIAkJaW50ZWxfZW5jb2Rlci0+cG9zdF9kaXNhYmxlID0gdmx2X3Bvc3Rf ZGlzYWJsZV9kcDsKPiArCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA1KSB7Cj4g KwkJaW50ZWxfZW5jb2Rlci0+cHJlX2VuYWJsZSA9IGc0eF9wcmVfZW5hYmxlX2RwOwo+ICsJCWlu dGVsX2VuY29kZXItPmVuYWJsZSA9IGc0eF9lbmFibGVfZHA7Cj4gKwkJaW50ZWxfZW5jb2Rlci0+ ZGlzYWJsZSA9IGlsa19kaXNhYmxlX2RwOwo+ICsJCWludGVsX2VuY29kZXItPnBvc3RfZGlzYWJs ZSA9IGlsa19wb3N0X2Rpc2FibGVfZHA7Cj4gIAl9IGVsc2Ugewo+ICAJCWludGVsX2VuY29kZXIt PnByZV9lbmFibGUgPSBnNHhfcHJlX2VuYWJsZV9kcDsKPiAgCQlpbnRlbF9lbmNvZGVyLT5lbmFi bGUgPSBnNHhfZW5hYmxlX2RwOwo+IC0JCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUpCj4g LQkJCWludGVsX2VuY29kZXItPnBvc3RfZGlzYWJsZSA9IGlsa19wb3N0X2Rpc2FibGVfZHA7Cj4g KwkJaW50ZWxfZW5jb2Rlci0+ZGlzYWJsZSA9IGc0eF9kaXNhYmxlX2RwOwo+ICAJfQo+ICAKPiAg CWludGVsX2RpZ19wb3J0LT5wb3J0ID0gcG9ydDsKPiAtLSAKPiAyLjEzLjUKPiAKPiBfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWls aW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==