From mboxrd@z Thu Jan 1 00:00:00 1970 From: Clint Taylor Subject: Re: [PATCH 07/10] drm/i915: Try to make sure cxsr is disabled around plane enable/disable Date: Fri, 26 Jun 2015 13:23:39 -0700 Message-ID: <558DB4CB.6040200@intel.com> References: <1435172410-9834-1-git-send-email-ville.syrjala@linux.intel.com> <1435172410-9834-8-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 684D56EE6F for ; Fri, 26 Jun 2015 13:26:00 -0700 (PDT) In-Reply-To: <1435172410-9834-8-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gMDYvMjQvMjAxNSAxMjowMCBQTSwgdmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20gd3Jv dGU6Cj4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNv bT4KPgo+IEN4U1IgKG9yIG1heGZpZm8gb24gVkxWL0NIVikgYmxvY2tzIHNvbW5lIGNoYW5nZXMg dG8gdGhlIHBsYW5lIGNvbnRyb2wKPiByZWdpc3RlciAoZW5hYmxlIGJpdCBhdCBsZWFzdCwgbm90 IHF1aXRlIHN1cmUgYWJvdXQgdGhlIHJlc3QpLiBTbyBpbgo+IG9yZGVyIHRvIGhhdmUgdGhlIHBs YW5lIGVuYWJsZS9kaXNhYmxlIHdoZW4gd2Ugd2FudCB3ZSBuZWVkIHRvIGZpcnN0Cj4ga2ljayB0 aGUgaGFyZHdhcmUgb3V0IG9mIGN4c3IuCj4KPiBVbmZvcnR1bmF0ZWxveSB0aGlzIHJlcXVpcmVz IHNvbWUgZXh0cmEgdmJsYW5rIHdhaXRzLiBGb3IgdGhlIEN4U1IKPiBlbmFibGUgYWZ0ZXIgdGhl IHBsYW5lIHVwZGF0ZSB3ZSBzaG91bGQgZXZlbnR1YWxseSB1c2UgYW4gYXN5bmMKPiB2Ymxhbmsg d29ya2VyLCBidXQgc2luY2Ugd2UgZG9uJ3QgaGF2ZSB0aGF0IGp1c3QgZG8gc3luYyB2YmxhbmsK PiB3YWl0cy4gRm9yIHRoZSBkaXNhYmxlIGNhc2Ugd2UgaGF2ZSBubyBjaG9pY2UgYnV0IHRvIGRv IGl0Cj4gc3luY2hyb25vdXNseS4KPgo+IFNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8 dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAzNiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAzICsrKwo+ ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwgMTEgKysrKy0tLS0tLS0K PiAgIDMgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCj4K PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXggZDY3YjVmMS4uMTlhZWRm OSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtNDcxNiw2ICs0 NzE2LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoc3RydWN0IGludGVs X2NydGMgKmNydGMpCj4KPiAgIAlpbnRlbF9mcm9udGJ1ZmZlcl9mbGlwKGRldiwgYXRvbWljLT5m Yl9iaXRzKTsKPgo+ICsJaWYgKGF0b21pYy0+ZGlzYWJsZV9jeHNyKQo+ICsJCWNydGMtPndtLmN4 c3JfYWxsb3dlZCA9IHRydWU7Cj4gKwo+ICAgCWlmIChjcnRjLT5hdG9taWMudXBkYXRlX3dtX3Bv c3QpCj4gICAJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKCZjcnRjLT5iYXNlKTsKPgo+IEBAIC00 NzY1LDYgKzQ3NjgsMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YykKPgo+ICAgCWlmIChhdG9taWMtPnByZV9kaXNhYmxlX3ByaW1h cnkpCj4gICAJCWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOwo+ICsKPiAr CWlmIChhdG9taWMtPmRpc2FibGVfY3hzcikgewo+ICsJCWNydGMtPndtLmN4c3JfYWxsb3dlZCA9 IGZhbHNlOwo+ICsJCWludGVsX3NldF9tZW1vcnlfY3hzcihkZXZfcHJpdiwgZmFsc2UpOwo+ICsJ fQo+ICAgfQo+Cj4gICBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywgdW5zaWduZWQgcGxhbmVfbWFzaykKPiBAQCAtMTE2NDYsMTIgKzEx NjU0LDI2IEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKPiAgIAkJCSBwbGFuZS0+YmFzZS5pZCwgd2FzX3Zpc2li bGUsIHZpc2libGUsCj4gICAJCQkgdHVybl9vZmYsIHR1cm5fb24sIG1vZGVfY2hhbmdlZCk7Cj4K PiAtCWlmICh0dXJuX29uKQo+ICsJaWYgKHR1cm5fb24pIHsKPiAgIAkJaW50ZWxfY3J0Yy0+YXRv bWljLnVwZGF0ZV93bV9wcmUgPSB0cnVlOwo+IC0JZWxzZSBpZiAodHVybl9vZmYpCj4gKwkJLyog bXVzdCBkaXNhYmxlIGN4c3IgYXJvdW5kIHBsYW5lIGVuYWJsZS9kaXNhYmxlICovCj4gKwkJaWYg KHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikgewo+ICsJCQlpbnRlbF9jcnRj LT5hdG9taWMuZGlzYWJsZV9jeHNyID0gdHJ1ZTsKPiArCQkJLyogdG8gcG90ZW50aWFsbHkgcmUt ZW5hYmxlIGN4c3IgKi8KPiArCQkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfdmJsYW5rID0gdHJ1 ZTsKPiArCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKPiArCQl9 Cj4gKwl9IGVsc2UgaWYgKHR1cm5fb2ZmKSB7Cj4gICAJCWludGVsX2NydGMtPmF0b21pYy51cGRh dGVfd21fcG9zdCA9IHRydWU7Cj4gLQllbHNlIGlmIChpbnRlbF93bV9uZWVkX3VwZGF0ZShwbGFu ZSwgcGxhbmVfc3RhdGUpKQo+ICsJCS8qIG11c3QgZGlzYWJsZSBjeHNyIGFyb3VuZCBwbGFuZSBl bmFibGUvZGlzYWJsZSAqLwo+ICsJCWlmIChwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9D VVJTT1IpIHsKPiArCQkJaWYgKGlzX2NydGNfZW5hYmxlZCkKPiArCQkJCWludGVsX2NydGMtPmF0 b21pYy53YWl0X3ZibGFuayA9IHRydWU7Cj4gKwkJCWludGVsX2NydGMtPmF0b21pYy5kaXNhYmxl X2N4c3IgPSB0cnVlOwo+ICsJCX0KPiArCX0gZWxzZSBpZiAoaW50ZWxfd21fbmVlZF91cGRhdGUo cGxhbmUsIHBsYW5lX3N0YXRlKSkgewo+ICAgCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dt X3ByZSA9IHRydWU7Cj4gKwl9Cj4KPiAgIAlpZiAodmlzaWJsZSkKPiAgIAkJaW50ZWxfY3J0Yy0+ YXRvbWljLmZiX2JpdHMgfD0KPiBAQCAtMTE4MDgsOCArMTE4MzAsOCBAQCBzdGF0aWMgaW50IGlu dGVsX2NydGNfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAgIAlpZiAocGlw ZV9jb25maWctPnF1aXJrcyAmIFBJUEVfQ09ORklHX1FVSVJLX0lOSVRJQUxfUExBTkVTKQo+ICAg CQlpbnRlbF9jcnRjX2NoZWNrX2luaXRpYWxfcGxhbmVzKGNydGMsIGNydGNfc3RhdGUpOwo+Cj4g LQlpZiAobW9kZV9jaGFuZ2VkKQo+IC0JCWludGVsX2NydGMtPmF0b21pYy51cGRhdGVfd21fcG9z dCA9ICFjcnRjX3N0YXRlLT5hY3RpdmU7Cj4gKwlpZiAobW9kZV9jaGFuZ2VkICYmICFjcnRjX3N0 YXRlLT5hY3RpdmUpCj4gKwkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bV9wb3N0ID0gdHJ1 ZTsKPgo+ICAgCWlmIChtb2RlX2NoYW5nZWQgJiYgY3J0Y19zdGF0ZS0+ZW5hYmxlICYmCj4gICAJ ICAgIGRldl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jayAmJgo+IEBAIC0xMzEyOSw2 ICsxMzE1MSw4IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqc3RhdGUpCj4gICAJCWlmICghbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkpCj4g ICAJCQljb250aW51ZTsKPgo+ICsJCWludGVsX3ByZV9wbGFuZV91cGRhdGUoaW50ZWxfY3J0Yyk7 Cj4gKwo+ICAgCQlhbnlfbXMgPSB0cnVlOwo+ICAgCQlpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKGlu dGVsX2NydGMpOwo+Cj4gQEAgLTE0MDg5LDYgKzE0MTEzLDggQEAgc3RhdGljIHZvaWQgaW50ZWxf Y3J0Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBlKQo+ICAgCWludGVsX2Ny dGMtPmN1cnNvcl9jbnRsID0gfjA7Cj4gICAJaW50ZWxfY3J0Yy0+Y3Vyc29yX3NpemUgPSB+MDsK Pgo+ICsJaW50ZWxfY3J0Yy0+d20uY3hzcl9hbGxvd2VkID0gdHJ1ZTsKPiArCj4gICAJQlVHX09O KHBpcGUgPj0gQVJSQVlfU0laRShkZXZfcHJpdi0+cGxhbmVfdG9fY3J0Y19tYXBwaW5nKSB8fAo+ ICAgCSAgICAgICBkZXZfcHJpdi0+cGxhbmVfdG9fY3J0Y19tYXBwaW5nW2ludGVsX2NydGMtPnBs YW5lXSAhPSBOVUxMKTsKPiAgIAlkZXZfcHJpdi0+cGxhbmVfdG9fY3J0Y19tYXBwaW5nW2ludGVs X2NydGMtPnBsYW5lXSA9ICZpbnRlbF9jcnRjLT5iYXNlOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCj4gaW5kZXggZjI2YTY4MC4uNGU4ZDEzZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCj4gQEAgLTUwNyw2ICs1MDcsNyBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0 IHsKPiAgIAkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJmb3JtIGJlZm9yZSBjb21taXQg Ki8KPiAgIAlib29sIHdhaXRfZm9yX2ZsaXBzOwo+ICAgCWJvb2wgZGlzYWJsZV9mYmM7Cj4gKwli b29sIGRpc2FibGVfY3hzcjsKPiAgIAlib29sIHByZV9kaXNhYmxlX3ByaW1hcnk7Cj4gICAJYm9v bCB1cGRhdGVfd21fcHJlLCB1cGRhdGVfd21fcG9zdDsKPiAgIAl1bnNpZ25lZCBkaXNhYmxlZF9w bGFuZXM7Cj4gQEAgLTU2NSw2ICs1NjYsOCBAQCBzdHJ1Y3QgaW50ZWxfY3J0YyB7Cj4gICAJCXN0 cnVjdCBpbnRlbF9waXBlX3dtIGFjdGl2ZTsKPiAgIAkJLyogU0tMIHdtIHZhbHVlcyBjdXJyZW50 bHkgaW4gdXNlICovCj4gICAJCXN0cnVjdCBza2xfcGlwZV93bSBza2xfYWN0aXZlOwo+ICsJCS8q IGFsbG93IEN4U1Igb24gdGhpcyBwaXBlICovCj4gKwkJYm9vbCBjeHNyX2FsbG93ZWQ7Cj4gICAJ fSB3bTsKPgo+ICAgCWludCBzY2FubGluZV9vZmZzZXQ7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j Cj4gaW5kZXggYzdjOTBjZS4uYjY1ODE3ZCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ IEBAIC0zMzUsNiArMzM1LDcgQEAgdm9pZCBpbnRlbF9zZXRfbWVtb3J5X2N4c3Ioc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBib29sIGVuYWJsZSkKPiAgIAlpZiAoSVNfVkFMTEVZ VklFVyhkZXYpKSB7Cj4gICAJCUk5MTVfV1JJVEUoRldfQkxDX1NFTEZfVkxWLCBlbmFibGUgPyBG V19DU1BXUkRXTkVOIDogMCk7Cj4gICAJCVBPU1RJTkdfUkVBRChGV19CTENfU0VMRl9WTFYpOwo+ ICsJCWRldl9wcml2LT53bS52bHYuY3hzciA9IGVuYWJsZTsKPiAgIAl9IGVsc2UgaWYgKElTX0c0 WChkZXYpIHx8IElTX0NSRVNUTElORShkZXYpKSB7Cj4gICAJCUk5MTVfV1JJVEUoRldfQkxDX1NF TEYsIGVuYWJsZSA/IEZXX0JMQ19TRUxGX0VOIDogMCk7Cj4gICAJCVBPU1RJTkdfUkVBRChGV19C TENfU0VMRik7Cj4gQEAgLTExMTYsNyArMTExNyw3IEBAIHN0YXRpYyB2b2lkIHZsdl9jb21wdXRl X3dtKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+Cj4gICAJbWVtc2V0KHdtX3N0YXRlLCAwLCBz aXplb2YoKndtX3N0YXRlKSk7Cj4KPiAtCXdtX3N0YXRlLT5jeHNyID0gY3J0Yy0+cGlwZSAhPSBQ SVBFX0M7Cj4gKwl3bV9zdGF0ZS0+Y3hzciA9IGNydGMtPnBpcGUgIT0gUElQRV9DICYmIGNydGMt PndtLmN4c3JfYWxsb3dlZDsKPiAgIAlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKQo+ICAgCQl3bV9z dGF0ZS0+bnVtX2xldmVscyA9IENIVl9XTV9OVU1fTEVWRUxTOwo+ICAgCWVsc2UKPiBAQCAtMTM2 OSwxMCArMTM3MCw4IEBAIHN0YXRpYyB2b2lkIHZsdl91cGRhdGVfd20oc3RydWN0IGRybV9jcnRj ICpjcnRjKQo+ICAgCSAgICBkZXZfcHJpdi0+d20udmx2LmxldmVsID49IFZMVl9XTV9MRVZFTF9Q TTUpCj4gICAJCWNodl9zZXRfbWVtb3J5X3BtNShkZXZfcHJpdiwgZmFsc2UpOwo+Cj4gLQlpZiAo IXdtLmN4c3IgJiYgZGV2X3ByaXYtPndtLnZsdi5jeHNyKSB7Cj4gKwlpZiAoIXdtLmN4c3IgJiYg ZGV2X3ByaXYtPndtLnZsdi5jeHNyKQo+ICAgCQlpbnRlbF9zZXRfbWVtb3J5X2N4c3IoZGV2X3By aXYsIGZhbHNlKTsKPiAtCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBwaXBlKTsKPiAtCX0K Pgo+ICAgCS8qIEZJWE1FIHNob3VsZCBiZSBwYXJ0IG9mIGNydGMgYXRvbWljIGNvbW1pdCAqLwo+ ICAgCXZsdl9waXBlX3NldF9maWZvX3NpemUoaW50ZWxfY3J0Yyk7Cj4gQEAgLTEzODUsMTAgKzEz ODQsOCBAQCBzdGF0aWMgdm9pZCB2bHZfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK PiAgIAkJICAgICAgd20ucGlwZVtwaXBlXS5zcHJpdGVbMF0sIHdtLnBpcGVbcGlwZV0uc3ByaXRl WzFdLAo+ICAgCQkgICAgICB3bS5zci5wbGFuZSwgd20uc3IuY3Vyc29yLCB3bS5sZXZlbCwgd20u Y3hzcik7Cj4KPiAtCWlmICh3bS5jeHNyICYmICFkZXZfcHJpdi0+d20udmx2LmN4c3IpIHsKPiAt CQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBwaXBlKTsKPiArCWlmICh3bS5jeHNyICYmICFk ZXZfcHJpdi0+d20udmx2LmN4c3IpCj4gICAJCWludGVsX3NldF9tZW1vcnlfY3hzcihkZXZfcHJp diwgdHJ1ZSk7Cj4gLQl9Cj4KPiAgIAlpZiAod20ubGV2ZWwgPj0gVkxWX1dNX0xFVkVMX1BNNSAm Jgo+ICAgCSAgICBkZXZfcHJpdi0+d20udmx2LmxldmVsIDwgVkxWX1dNX0xFVkVMX1BNNSkKPgoK UmV2aWV3ZWQtYnk6IENsaW50IFRheWxvciA8Q2xpbnRvbi5BLlRheWxvckBpbnRlbC5jb20+ClRl c3RlZC1ieTogQ2xpbnQgVGF5bG9yIDxDbGludG9uLkEuVGF5bG9yQGludGVsLmNvbT4KCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==