From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 10/11] drm/i915: Move VLV cmnlane workaround to intel_power_domains_init_hw() Date: Wed, 25 Jun 2014 12:03:01 -0700 Message-ID: <20140625120301.3aa2acd1@jbarnes-desktop> References: <1402655877-6460-1-git-send-email-ville.syrjala@linux.intel.com> <1402655877-6460-11-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 96E6E6E2CF for ; Wed, 25 Jun 2014 12:02:27 -0700 (PDT) Received: by mail-pa0-f42.google.com with SMTP id lj1so2086159pab.15 for ; Wed, 25 Jun 2014 12:02:27 -0700 (PDT) In-Reply-To: <1402655877-6460-11-git-send-email-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@linux.intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCAxMyBKdW4gMjAxNCAxMzozNzo1NiArMDMwMAp2aWxsZS5zeXJqYWxhQGxpbnV4Lmlu dGVsLmNvbSB3cm90ZToKCj4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KPiAKPiBOb3cgdGhhdCB0aGUgQ01OUkVTRVQgZGVhc3NlcnQgaXMgcGFy dCBvZiB0aGUgY21ubGFuZSBwb3dlciB3ZWxsLAo+IGludGVsX3Jlc2V0X2RwaW8oKSBpcyBjYWxs ZWQgdG9vIGxhdGUgdG8gbWFrZSBhbnkgZGlmZmVyZW5jZS4gV2UndmUKPiBkZWFzc2VydGVkIENN TlJFU0VUIGJ5IHRoYXQgdGltZSwgYW5kIHNvIHRoZSBvZmYrb24gdG9nZ2xlIHcvYSB3aWxsCj4g bmV2ZXIga2ljayBpbi4KPiAKPiBNb3ZlIHRoZSB3b3JrYXJvdW5kIHRvIGludGVsX3Bvd2VyX2Rv bWFpbnNfaW5pdF9odygpIHdoZXJlIGl0IGdldHMKPiBjYWxsZWQgYmVmb3JlIHdlIGVuYWJsZSB0 aGUgaW5pdCBwb3dlciBkb21haW4uCj4gCj4gU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMjMgLS0tLS0tLS0tLS0tLQo+ICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMyArLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jICAgICAgfCA2NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0K PiAgMyBmaWxlcyBjaGFuZ2VkLCA1OCBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMoLSkKPiAK PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXggMzNjYzIxMy4uYmNkMzIz MjIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gQEAgLTE1MDgsOSAr MTUwOCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX3Jlc2V0X2RwaW8oc3RydWN0IGRybV9kZXZpY2Ug KmRldikKPiAgewo+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKPiAgCj4gLQlpZiAoIUlTX1ZBTExFWVZJRVcoZGV2KSkKPiAtCQlyZXR1cm47 Cj4gLQo+ICAJaWYgKElTX0NIRVJSWVZJRVcoZGV2KSkgewo+ICAJCWVudW0gZHBpb19waHkgcGh5 Owo+ICAJCXUzMiB2YWw7Cj4gQEAgLTE1MzIsMjYgKzE1MjksNiBAQCBzdGF0aWMgdm9pZCBpbnRl bF9yZXNldF9kcGlvKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAkJCUk5MTVfV1JJVEUoRElT UExBWV9QSFlfQ09OVFJPTCwKPiAgCQkJCVBIWV9DT01fTEFORV9SRVNFVF9ERUFTU0VSVChwaHks IHZhbCkpOwo+ICAJCX0KPiAtCj4gLQl9IGVsc2Ugewo+IC0JCS8qCj4gLQkJICogSWYgRFBJTyBo YXMgYWxyZWFkeSBiZWVuIHJlc2V0LCBlLmcuIGJ5IEJJT1MsIGp1c3Qgc2tpcCBhbGwKPiAtCQkg KiB0aGlzLgo+IC0JCSAqLwo+IC0JCWlmIChJOTE1X1JFQUQoRFBJT19DVEwpICYgRFBJT19DTU5S U1QpCj4gLQkJCXJldHVybjsKPiAtCj4gLQkJLyoKPiAtCQkgKiBGcm9tIFZMVjJBMF9EUF9lRFBf SERNSV9EUElPX2RyaXZlcl92Ymlvc19ub3Rlc18xMS5kb2N4Ogo+IC0JCSAqIE5lZWQgdG8gYXNz ZXJ0IGFuZCBkZS1hc3NlcnQgUEhZIFNCIHJlc2V0IGJ5IGdhdGluZyB0aGUKPiAtCQkgKiBjb21t b24gbGFuZSBwb3dlciwgdGhlbiB1bi1nYXRpbmcgaXQuCj4gLQkJICogU2ltcGx5IHVuZ2F0aW5n IGlzbid0IGVub3VnaCB0byByZXNldCB0aGUgUEhZIGVub3VnaCB0byBnZXQKPiAtCQkgKiBwb3J0 cyBhbmQgbGFuZXMgcnVubmluZy4KPiAtCQkgKi8KPiAtCQlfX3Zsdl9zZXRfcG93ZXJfd2VsbChk ZXZfcHJpdiwgUFVOSVRfUE9XRVJfV0VMTF9EUElPX0NNTl9CQywKPiAtCQkJCSAgICAgZmFsc2Up Owo+IC0JCV9fdmx2X3NldF9wb3dlcl93ZWxsKGRldl9wcml2LCBQVU5JVF9QT1dFUl9XRUxMX0RQ SU9fQ01OX0JDLAo+IC0JCQkJICAgICB0cnVlKTsKPiAgCX0KPiAgfQo+ICAKPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAo+IGluZGV4IDU3NDBiZTAuLmU1NjU5MDYgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAo+IEBAIC05NzAsOCArOTcwLDcgQEAgdm9pZCBpbnRlbF9ydW50aW1lX3Bt X3B1dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwo+ICB2b2lkIGludGVsX2lu aXRfcnVudGltZV9wbShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwo+ICB2b2lk IGludGVsX2ZpbmlfcnVudGltZV9wbShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp Owo+ICB2b2lkIGlsa193bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cj4g LXZvaWQgX192bHZfc2V0X3Bvd2VyX3dlbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAo+IC0JCQkgIGVudW0gcHVuaXRfcG93ZXJfd2VsbCBwb3dlcl93ZWxsX2lkLCBib29sIGVu YWJsZSk7Cj4gKwo+ICAKPiAgLyogaW50ZWxfc2R2by5jICovCj4gIGJvb2wgaW50ZWxfc2R2b19p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQzMl90IHNkdm9fcmVnLCBib29sIGlzX3Nk dm9iKTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBpbmRleCBlOWE4NTY1Li5kOGUyMGQzIDEw MDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gQEAgLTU5NjIsOSArNTk2MiwxMCBAQCBzdGF0 aWMgYm9vbCBpOXh4X2Fsd2F5c19vbl9wb3dlcl93ZWxsX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAo+ICAJcmV0dXJuIHRydWU7Cj4gIH0KPiAgCj4gLXZvaWQgX192 bHZfc2V0X3Bvd2VyX3dlbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+IC0J CQkgIGVudW0gcHVuaXRfcG93ZXJfd2VsbCBwb3dlcl93ZWxsX2lkLCBib29sIGVuYWJsZSkKPiAr c3RhdGljIHZvaWQgdmx2X3NldF9wb3dlcl93ZWxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKPiArCQkJICAgICAgIHN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgKnBvd2VyX3dlbGws IGJvb2wgZW5hYmxlKQo+ICB7Cj4gKwllbnVtIHB1bml0X3Bvd2VyX3dlbGwgcG93ZXJfd2VsbF9p ZCA9IHBvd2VyX3dlbGwtPmRhdGE7Cj4gIAl1MzIgbWFzazsKPiAgCXUzMiBzdGF0ZTsKPiAgCXUz MiBjdHJsOwo+IEBAIC01OTk3LDE0ICs1OTk4LDYgQEAgb3V0Ogo+ICAJbXV0ZXhfdW5sb2NrKCZk ZXZfcHJpdi0+cnBzLmh3X2xvY2spOwo+ICB9Cj4gIAo+IC1zdGF0aWMgdm9pZCB2bHZfc2V0X3Bv d2VyX3dlbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+IC0JCQkgICAgICAg c3RydWN0IGk5MTVfcG93ZXJfd2VsbCAqcG93ZXJfd2VsbCwgYm9vbCBlbmFibGUpCj4gLXsKPiAt CWVudW0gcHVuaXRfcG93ZXJfd2VsbCBwb3dlcl93ZWxsX2lkID0gcG93ZXJfd2VsbC0+ZGF0YTsK PiAtCj4gLQlfX3Zsdl9zZXRfcG93ZXJfd2VsbChkZXZfcHJpdiwgcG93ZXJfd2VsbF9pZCwgZW5h YmxlKTsKPiAtfQo+IC0KPiAgc3RhdGljIHZvaWQgdmx2X3Bvd2VyX3dlbGxfc3luY19odyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gIAkJCQkgICBzdHJ1Y3QgaTkxNV9wb3dl cl93ZWxsICpwb3dlcl93ZWxsKQo+ICB7Cj4gQEAgLTY0MzUsNiArNjQyOCwyMSBAQCBzdGF0aWMg c3RydWN0IGk5MTVfcG93ZXJfd2VsbCB2bHZfcG93ZXJfd2VsbHNbXSA9IHsKPiAgCX0sCj4gIH07 Cj4gIAo+ICtzdGF0aWMgc3RydWN0IGk5MTVfcG93ZXJfd2VsbCAqbG9va3VwX3Bvd2VyX3dlbGwo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ICsJCQkJCQkgZW51bSBwdW5pdF9w b3dlcl93ZWxsIHBvd2VyX3dlbGxfaWQpCj4gK3sKPiArCXN0cnVjdCBpOTE1X3Bvd2VyX2RvbWFp bnMgKnBvd2VyX2RvbWFpbnMgPSAmZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnM7Cj4gKwlzdHJ1Y3Qg aTkxNV9wb3dlcl93ZWxsICpwb3dlcl93ZWxsOwo+ICsJaW50IGk7Cj4gKwo+ICsJZm9yX2VhY2hf cG93ZXJfd2VsbChpLCBwb3dlcl93ZWxsLCBQT1dFUl9ET01BSU5fTUFTSywgcG93ZXJfZG9tYWlu cykgewo+ICsJCWlmIChwb3dlcl93ZWxsLT5kYXRhID09IHBvd2VyX3dlbGxfaWQpCj4gKwkJCXJl dHVybiBwb3dlcl93ZWxsOwo+ICsJfQo+ICsKPiArCXJldHVybiBOVUxMOwo+ICt9Cj4gKwo+ICAj ZGVmaW5lIHNldF9wb3dlcl93ZWxscyhwb3dlcl9kb21haW5zLCBfX3Bvd2VyX3dlbGxzKSAoewkJ XAo+ICAJKHBvd2VyX2RvbWFpbnMpLT5wb3dlcl93ZWxscyA9IChfX3Bvd2VyX3dlbGxzKTsJCQlc Cj4gIAkocG93ZXJfZG9tYWlucyktPnBvd2VyX3dlbGxfY291bnQgPSBBUlJBWV9TSVpFKF9fcG93 ZXJfd2VsbHMpOwlcCj4gQEAgLTY0ODIsMTEgKzY0OTAsNTAgQEAgc3RhdGljIHZvaWQgaW50ZWxf cG93ZXJfZG9tYWluc19yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ ICAJbXV0ZXhfdW5sb2NrKCZwb3dlcl9kb21haW5zLT5sb2NrKTsKPiAgfQo+ICAKPiArc3RhdGlj IHZvaWQgdmx2X2NtbmxhbmVfd2Eoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ ICt7Cj4gKwlzdHJ1Y3QgaTkxNV9wb3dlcl93ZWxsICpjbW4gPQo+ICsJCWxvb2t1cF9wb3dlcl93 ZWxsKGRldl9wcml2LCBQVU5JVF9QT1dFUl9XRUxMX0RQSU9fQ01OX0JDKTsKPiArCXN0cnVjdCBp OTE1X3Bvd2VyX3dlbGwgKmRpc3AyZCA9Cj4gKwkJbG9va3VwX3Bvd2VyX3dlbGwoZGV2X3ByaXYs IFBVTklUX1BPV0VSX1dFTExfRElTUDJEKTsKPiArCj4gKwkvKiBub3RoaW5nIHRvIGRvIGlmIGNv bW1vbiBsYW5lIGlzIGFscmVhZHkgb2ZmICovCj4gKwlpZiAoIWNtbi0+b3BzLT5pc19lbmFibGVk KGRldl9wcml2LCBjbW4pKQo+ICsJCXJldHVybjsKPiArCj4gKwkvKiBJZiB0aGUgZGlzcGxheSBt aWdodCBiZSBhbHJlYWR5IGFjdGl2ZSBza2lwIHRoaXMgKi8KPiArCWlmIChkaXNwMmQtPm9wcy0+ aXNfZW5hYmxlZChkZXZfcHJpdiwgZGlzcDJkKSAmJgo+ICsJICAgIEk5MTVfUkVBRChEUElPX0NU TCkgJiBEUElPX0NNTlJTVCkKPiArCQlyZXR1cm47Cj4gKwo+ICsJRFJNX0RFQlVHX0tNUygidG9n Z2xpbmcgZGlzcGxheSBQSFkgc2lkZSByZXNldFxuIik7Cj4gKwo+ICsJLyogY21ubGFuZSBuZWVk cyBEUExMIHJlZ2lzdGVycyAqLwo+ICsJZGlzcDJkLT5vcHMtPmVuYWJsZShkZXZfcHJpdiwgZGlz cDJkKTsKPiArCj4gKwkvKgo+ICsJICogRnJvbSBWTFYyQTBfRFBfZURQX0hETUlfRFBJT19kcml2 ZXJfdmJpb3Nfbm90ZXNfMTEuZG9jeDoKPiArCSAqIE5lZWQgdG8gYXNzZXJ0IGFuZCBkZS1hc3Nl cnQgUEhZIFNCIHJlc2V0IGJ5IGdhdGluZyB0aGUKPiArCSAqIGNvbW1vbiBsYW5lIHBvd2VyLCB0 aGVuIHVuLWdhdGluZyBpdC4KPiArCSAqIFNpbXBseSB1bmdhdGluZyBpc24ndCBlbm91Z2ggdG8g cmVzZXQgdGhlIFBIWSBlbm91Z2ggdG8gZ2V0Cj4gKwkgKiBwb3J0cyBhbmQgbGFuZXMgcnVubmlu Zy4KPiArCSAqLwo+ICsJY21uLT5vcHMtPmRpc2FibGUoZGV2X3ByaXYsIGNtbik7Cj4gK30KPiAr Cj4gIHZvaWQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKPiAgewo+ICsJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9wcml2 LT5kZXY7Cj4gIAlzdHJ1Y3QgaTkxNV9wb3dlcl9kb21haW5zICpwb3dlcl9kb21haW5zID0gJmRl dl9wcml2LT5wb3dlcl9kb21haW5zOwo+ICAKPiAgCXBvd2VyX2RvbWFpbnMtPmluaXRpYWxpemlu ZyA9IHRydWU7Cj4gKwo+ICsJaWYgKElTX1ZBTExFWVZJRVcoZGV2KSAmJiAhSVNfQ0hFUlJZVklF VyhkZXYpKSB7Cj4gKwkJbXV0ZXhfbG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7Cj4gKwkJdmx2 X2NtbmxhbmVfd2EoZGV2X3ByaXYpOwo+ICsJCW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+ bG9jayk7Cj4gKwl9Cj4gKwo+ICAJLyogRm9yIG5vdywgd2UgbmVlZCB0aGUgcG93ZXIgd2VsbCB0 byBiZSBhbHdheXMgZW5hYmxlZC4gKi8KPiAgCWludGVsX2Rpc3BsYXlfc2V0X2luaXRfcG93ZXIo ZGV2X3ByaXYsIHRydWUpOwo+ICAJaW50ZWxfcG93ZXJfZG9tYWluc19yZXN1bWUoZGV2X3ByaXYp OwoKSSBraW5kIG9mIHByZWZlcnJlZCB0aGUgbG93IGxldmVsIGZ1bmN0aW9uIHRoYXQganVzdCB0 b29rIGEgd2VsbCBJRApkaXJlY3RseSBzaW5jZSB0aGUgaWRlYSBvZiBsb29raW5nIHNvbWV0aGlu ZyB3ZSBhbHJlYWR5IGtub3cgc2VlbXMKc2lsbHkgKGFuZCBpdCBzaG91bGQgcHJvYmFibHkgYmUg YSBzZXBhcmF0ZSBwYXRjaCBhbnl3YXkpLiBBbHNvIEknbSBub3QKc3VyZSBJIHdvdWxkIGRlc2Ny aWJlIHRoaXMgYXMgYSBXL0E7IHRoZSBwaHkgbmVlZHMgdG8gZ2V0IHJlc2V0CnNvbWVob3cuLi4K CkJ1dCB3aXRoIG9yIHdpdGhvdXQgdGhvc2UgY2hhbmdlcywgd2UgbmVlZCB0aGlzLgoKUmV2aWV3 ZWQtYnk6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsub3JnPgoKLS0gCkplc3Nl IEJhcm5lcywgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK