From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH 1/3] drm/i915: Don't check modeset state in the hw state force restore path Date: Mon, 15 Jun 2015 19:00:46 -0700 Message-ID: <20150616020046.GK13852@intel.com> References: <1434093582-5824-1-git-send-email-ander.conselvan.de.oliveira@intel.com> <1434093582-5824-2-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id CA5B66E083 for ; Mon, 15 Jun 2015 19:00:47 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1434093582-5824-2-git-send-email-ander.conselvan.de.oliveira@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ander Conselvan de Oliveira Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCBKdW4gMTIsIDIwMTUgYXQgMTA6MTk6NDBBTSArMDMwMCwgQW5kZXIgQ29uc2VsdmFu IGRlIE9saXZlaXJhIHdyb3RlOgo+IFNpbmNlIHRoZSBmb3JjZSByZXN0b3JlIGxvZ2ljIHdpbGwg cmVzdG9yZSB0aGUgQ1JUQ3Mgc3RhdGUgb25lIGF0IGEKPiB0aW1lLCBpdCBpcyBwb3NzaWJsZSB0 aGF0IHRoZSBzdGF0ZSB3aWxsIGJlIGluY29uc2lzdGVudCB1bnRpbCB0aGUgd2hvbGUKPiBvcGVy YXRpb24gZmluaXNoZXMuIEEgY2FsbCB0byBpbnRlbF9tb2Rlc2V0X2NoZWNrX3N0YXRlKCkgaXMg ZG9uZSBvbmNlCj4gaXQncyBvdmVyLCBzbyBkb24ndCBjaGVjayB0aGUgc3RhdGUgbXVsdGlwbGUg dGltZXMgaW4gYmV0d2Vlbi4gVGhpcwo+IHJlZ3Jlc3Npb24gd2FzIGludHJvZHVjZWQgaW46Cj4g Cj4gY29tbWl0IDdmMjcxMjZlYTNkYjZhZGU4ODZmMThmZDM5Y2FmMGZmMGNkMWQzN2YKPiBBdXRo b3I6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsub3JnPgo+IERhdGU6ICAgV2Vk IE5vdiA1IDE0OjI2OjA2IDIwMTQgLTA4MDAKPiAKPiAgICAgZHJtL2k5MTU6IGZhY3RvciBvdXQg Y29tcHV0ZV9jb25maWcgZnJvbSBfX2ludGVsX3NldF9tb2RlIHYzCj4gCj4gQnVnemlsbGE6IGh0 dHBzOi8vYnVnemlsbGEua2VybmVsLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ0MzEKPiBDYzogSmVz c2UgQmFybmVzIDxqYmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+Cj4gU2lnbmVkLW9mZi1ieTogQW5k ZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50 ZWwuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAy MSArKysrKysrKysrKystLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMo KyksIDkgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ IGluZGV4IDRlM2YzMDIuLjZlZjU3ZTYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCj4gQEAgLTg3LDcgKzg3LDggQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfcGNoX2Nsb2Nr X2dldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKPiAgCQkJCSAgIHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpwaXBlX2NvbmZpZyk7Cj4gIAo+ICBzdGF0aWMgaW50IGludGVsX3NldF9tb2RlKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAtCQkJICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh dGUpOwo+ICsJCQkgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKPiArCQkJICBib29s IGNoZWNrKTsKPiAgc3RhdGljIGludCBpbnRlbF9mcmFtZWJ1ZmZlcl9pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCj4gIAkJCQkgIHN0cnVjdCBpbnRlbF9mcmFtZWJ1ZmZlciAqaWZiLAo+ICAJ CQkJICBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqbW9kZV9jbWQsCj4gQEAgLTEwMDk2LDcgKzEw MDk3LDcgQEAgcmV0cnk6Cj4gIAo+ICAJZHJtX21vZGVfY29weSgmY3J0Y19zdGF0ZS0+YmFzZS5t b2RlLCBtb2RlKTsKPiAgCj4gLQlpZiAoaW50ZWxfc2V0X21vZGUoY3J0Yywgc3RhdGUpKSB7Cj4g KwlpZiAoaW50ZWxfc2V0X21vZGUoY3J0Yywgc3RhdGUsIHRydWUpKSB7Cj4gIAkJRFJNX0RFQlVH X0tNUygiZmFpbGVkIHRvIHNldCBtb2RlIG9uIGxvYWQtZGV0ZWN0IHBpcGVcbiIpOwo+ICAJCWlm IChvbGQtPnJlbGVhc2VfZmIpCj4gIAkJCW9sZC0+cmVsZWFzZV9mYi0+ZnVuY3MtPmRlc3Ryb3ko b2xkLT5yZWxlYXNlX2ZiKTsKPiBAQCAtMTAxNzAsNyArMTAxNzEsNyBAQCB2b2lkIGludGVsX3Jl bGVhc2VfbG9hZF9kZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAo+ ICAJCWlmIChyZXQpCj4gIAkJCWdvdG8gZmFpbDsKPiAgCj4gLQkJcmV0ID0gaW50ZWxfc2V0X21v ZGUoY3J0Yywgc3RhdGUpOwo+ICsJCXJldCA9IGludGVsX3NldF9tb2RlKGNydGMsIHN0YXRlLCB0 cnVlKTsKPiAgCQlpZiAocmV0KQo+ICAJCQlnb3RvIGZhaWw7Cj4gIAo+IEBAIC0xMjY0NiwyMCAr MTI2NDcsMjIgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAq bW9kZXNldF9jcnRjLAo+ICB9Cj4gIAo+ICBzdGF0aWMgaW50IGludGVsX3NldF9tb2RlX3dpdGhf Y29uZmlnKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAtCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpwaXBlX2NvbmZpZykKPiArCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpwaXBlX2NvbmZpZywKPiArCQkJCSAgICAgIGJvb2wgY2hlY2spCgpUaGlzIHBhcmFtZXRl ciBqdXN0IGNvbnRyb2xzIHdoZXRoZXIgeW91IGNoZWNrIHRoZSBzdGF0ZSBvciBub3QgaW4gdGhp cwpwYXRjaCwgYnV0IGluIHBhdGNoICMyIGl0IGFsc28gc3RhcnRzIGhhdmluZyBtb3JlIG9mIGEg YmVoYXZpb3JhbCBpbXBhY3QKKGkuZS4sICJkb24ndCB1cGRhdGVkIHN0YWdlZCBvdXRwdXQgY29u ZmlndXJhdGlvbiIpLiAgSSB3b25kZXIgaWYKcGlja2luZyBhIGRpZmZlcmVudCBuYW1lIGZvciB0 aGlzIHBhcmFtZXRlciB3b3VsZCBoZWxwIGF2b2lkIGFueQpjb25mdXNpb24/CgpPdGhlcndpc2Us IHRoaXMgcGF0Y2ggbG9va3MgZ29vZDoKICAgUmV2aWV3ZWQtYnk6IE1hdHQgUm9wZXIgPG1hdHRo ZXcuZC5yb3BlckBpbnRlbC5jb20+CgpPZmYtdG9waWMsIGJ1dCBzcGVha2luZyBvZiAnY2hlY2sn IEkgd29uZGVyIHdoZXRoZXIgd2Ugc2hvdWxkIGFsc28KcmVuYW1lIHRoZSBpbnRlbF9tb2Rlc2V0 X2NoZWNrX3N0YXRlIGZ1bmN0aW9uIGFuZCByZWxhdGVkIGZ1bmN0aW9ucyBhdApzb21lIHBvaW50 IGluIHRoZSBmdXR1cmUuICBFdmVyeSB0aW1lIEkgc2VlIHRoYXQgbmFtZSBpbiB0aGUgY29kZSBp dApib3RoZXJzIG1lIGJlY2F1c2UgSSBleHBlY3QgaXQgdG8gYmUgcmVsYXRlZCB0byBhdG9taWMg Y2hlY2sgKGkuZS4sCnNvbWV0aGluZyB0aGF0IHJ1bnMgYmVmb3JlIHdlIHRvdWNoIGhhcmR3YXJl KSByYXRoZXIgdGhhbiBjb25maXJtaW5nCnRoYXQgaGFyZHdhcmUgcHJvZ3JhbW1pbmcgd2FzIHN1 Y2Nlc3NmdWwuICBJdCBmZWVscyBtb3JlIGxpa2UgYW4KYXNzZXJ0L2NvbmZpcm0vdmVyaWZ5IGZ1 bmN0aW9uIHRvIG1lLgoKCk1hdHQKCj4gIHsKPiAgCWludCByZXQ7Cj4gIAo+ICAJcmV0ID0gX19p bnRlbF9zZXRfbW9kZShjcnRjLCBwaXBlX2NvbmZpZyk7Cj4gIAo+IC0JaWYgKHJldCA9PSAwKQo+ ICsJaWYgKHJldCA9PSAwICYmIGNoZWNrKQo+ICAJCWludGVsX21vZGVzZXRfY2hlY2tfc3RhdGUo Y3J0Yy0+ZGV2KTsKPiAgCj4gIAlyZXR1cm4gcmV0Owo+ICB9Cj4gIAo+ICBzdGF0aWMgaW50IGlu dGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAtCQkJICBzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCj4gKwkJCSAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl LAo+ICsJCQkgIGJvb2wgY2hlY2spCj4gIHsKPiAgCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpw aXBlX2NvbmZpZzsKPiAgCWludCByZXQgPSAwOwo+IEBAIC0xMjY3MCw3ICsxMjY3Myw3IEBAIHN0 YXRpYyBpbnQgaW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ICAJCWdvdG8g b3V0Owo+ICAJfQo+ICAKPiAtCXJldCA9IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmlnKGNydGMs IHBpcGVfY29uZmlnKTsKPiArCXJldCA9IGludGVsX3NldF9tb2RlX3dpdGhfY29uZmlnKGNydGMs IHBpcGVfY29uZmlnLCBjaGVjayk7Cj4gIAlpZiAocmV0KQo+ICAJCWdvdG8gb3V0Owo+ICAKPiBA QCAtMTI3NDcsNyArMTI3NTAsNyBAQCB2b2lkIGludGVsX2NydGNfcmVzdG9yZV9tb2RlKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKPiAgCWludGVsX21vZGVzZXRfc2V0dXBfcGxhbmVfc3RhdGUoc3Rh dGUsIGNydGMsICZjcnRjLT5tb2RlLAo+ICAJCQkJCWNydGMtPnByaW1hcnktPmZiLCBjcnRjLT54 LCBjcnRjLT55KTsKPiAgCj4gLQlyZXQgPSBpbnRlbF9zZXRfbW9kZShjcnRjLCBzdGF0ZSk7Cj4g KwlyZXQgPSBpbnRlbF9zZXRfbW9kZShjcnRjLCBzdGF0ZSwgZmFsc2UpOwo+ICAJaWYgKHJldCkK PiAgCQlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOwo+ICB9Cj4gQEAgLTEyOTQ3LDcgKzEy OTUwLDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3NldF9jb25maWcoc3RydWN0IGRybV9tb2Rl X3NldCAqc2V0KQo+ICAKPiAgCXByaW1hcnlfcGxhbmVfd2FzX3Zpc2libGUgPSBwcmltYXJ5X3Bs YW5lX3Zpc2libGUoc2V0LT5jcnRjKTsKPiAgCj4gLQlyZXQgPSBpbnRlbF9zZXRfbW9kZV93aXRo X2NvbmZpZyhzZXQtPmNydGMsIHBpcGVfY29uZmlnKTsKPiArCXJldCA9IGludGVsX3NldF9tb2Rl X3dpdGhfY29uZmlnKHNldC0+Y3J0YywgcGlwZV9jb25maWcsIHRydWUpOwo+ICAKPiAgCWlmIChy ZXQgPT0gMCAmJgo+ICAJICAgIHBpcGVfY29uZmlnLT5iYXNlLmVuYWJsZSAmJgo+IC0tIAo+IDIu MS4wCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K PiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y Zwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngKCi0tIApNYXR0IFJvcGVyCkdyYXBoaWNzIFNvZnR3YXJlIEVuZ2luZWVyCklvVEcgUGxhdGZv cm0gRW5hYmxpbmcgJiBEZXZlbG9wbWVudApJbnRlbCBDb3Jwb3JhdGlvbgooOTE2KSAzNTYtMjc5 NQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=